From 24adf1ad5449505a43f572132c023a01f726f14a Mon Sep 17 00:00:00 2001 From: Rachel Lambda Samuelsson Date: Mon, 24 Jun 2024 22:35:21 +0200 Subject: [PATCH] more refactor --- flake.nix | 17 +++++++++-------- {home => home-manager}/all.nix | 0 {home => home-manager}/applications.nix | 0 {home => home-manager}/fetch.nix | 0 {home => home-manager}/git.nix | 0 {home => home-manager}/gpg.nix | 0 {home => home-manager}/hm-settings.nix | 0 {home => home-manager}/launcher.nix | 0 {home => home-manager}/media.nix | 0 {home => home-manager}/neovim.nix | 0 {home => home-manager}/shell.nix | 0 {home => home-manager}/ssh.nix | 0 {home => home-manager}/terminal.nix | 0 {home => home-manager}/tmux.nix | 0 {home => home-manager}/xdg-dirs.nix | 0 .../computational}/configuration.nix | 0 .../computational}/hardware-configuration.nix | 0 {lambda => nixos/lambda}/configuration.nix | 2 +- .../lambda}/hardware-configuration.nix | 0 {shared => nixos/shared}/graphical.nix | 0 {shared => nixos/shared}/user-system.nix | 6 +++--- {shared => resources}/fox.xkb | 0 .../grub-theme}/background.png | Bin .../sayonara => resources/grub-theme}/info.png | Bin .../grub-theme}/theme.txt | 0 .../grub-theme}/victor-pixel-32.pf2 | Bin {shared => resources}/sus.xkb | 0 shared/.gitignore | 1 - 28 files changed, 13 insertions(+), 13 deletions(-) rename {home => home-manager}/all.nix (100%) rename {home => home-manager}/applications.nix (100%) rename {home => home-manager}/fetch.nix (100%) rename {home => home-manager}/git.nix (100%) rename {home => home-manager}/gpg.nix (100%) rename {home => home-manager}/hm-settings.nix (100%) rename {home => home-manager}/launcher.nix (100%) rename {home => home-manager}/media.nix (100%) rename {home => home-manager}/neovim.nix (100%) rename {home => home-manager}/shell.nix (100%) rename {home => home-manager}/ssh.nix (100%) rename {home => home-manager}/terminal.nix (100%) rename {home => home-manager}/tmux.nix (100%) rename {home => home-manager}/xdg-dirs.nix (100%) rename {computational => nixos/computational}/configuration.nix (100%) rename {computational => nixos/computational}/hardware-configuration.nix (100%) rename {lambda => nixos/lambda}/configuration.nix (97%) rename {lambda => nixos/lambda}/hardware-configuration.nix (100%) rename {shared => nixos/shared}/graphical.nix (100%) rename {shared => nixos/shared}/user-system.nix (94%) rename {shared => resources}/fox.xkb (100%) rename {shared/sayonara => resources/grub-theme}/background.png (100%) rename {shared/sayonara => resources/grub-theme}/info.png (100%) rename {shared/sayonara => resources/grub-theme}/theme.txt (100%) rename {shared/sayonara => resources/grub-theme}/victor-pixel-32.pf2 (100%) rename {shared => resources}/sus.xkb (100%) delete mode 100644 shared/.gitignore diff --git a/flake.nix b/flake.nix index 35b5836..2e6e173 100644 --- a/flake.nix +++ b/flake.nix @@ -42,7 +42,7 @@ sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ]; useGlobalPkgs = true; useUserPackages = true; - users.rachel = import ./home/all.nix { + users.rachel = import ./home-manager/all.nix { pkgs = import nixpkgs { system = system; config.allowUnfree = true; @@ -74,9 +74,9 @@ nixosConfigurations.lambda = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; modules = base-modules ++ [ - ./lambda/configuration.nix - ./shared/user-system.nix - ./shared/graphical.nix + ./nixos/lambda/configuration.nix + ./nixos/shared/user-system.nix + ./nixos/shared/graphical.nix (rachel-home-module system) ]; }; @@ -84,14 +84,15 @@ nixosConfigurations.computational = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; modules = base-modules ++ [ - ./computational/configuration.nix - ./shared/user-system.nix - ./shared/graphical.nix + ./nixos/computational/configuration.nix + ./nixos/shared/user-system.nix + ./nixos/shared/graphical.nix (rachel-home-module system) ]; }; - keyboardLayouts.fox = ./shared/fox.xkb; + keyboardLayouts.fox = ./resources/fox.xkb; + keyboardLayouts.sus = ./resources/fox.xkb; } // flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; diff --git a/home/all.nix b/home-manager/all.nix similarity index 100% rename from home/all.nix rename to home-manager/all.nix diff --git a/home/applications.nix b/home-manager/applications.nix similarity index 100% rename from home/applications.nix rename to home-manager/applications.nix diff --git a/home/fetch.nix b/home-manager/fetch.nix similarity index 100% rename from home/fetch.nix rename to home-manager/fetch.nix diff --git a/home/git.nix b/home-manager/git.nix similarity index 100% rename from home/git.nix rename to home-manager/git.nix diff --git a/home/gpg.nix b/home-manager/gpg.nix similarity index 100% rename from home/gpg.nix rename to home-manager/gpg.nix diff --git a/home/hm-settings.nix b/home-manager/hm-settings.nix similarity index 100% rename from home/hm-settings.nix rename to home-manager/hm-settings.nix diff --git a/home/launcher.nix b/home-manager/launcher.nix similarity index 100% rename from home/launcher.nix rename to home-manager/launcher.nix diff --git a/home/media.nix b/home-manager/media.nix similarity index 100% rename from home/media.nix rename to home-manager/media.nix diff --git a/home/neovim.nix b/home-manager/neovim.nix similarity index 100% rename from home/neovim.nix rename to home-manager/neovim.nix diff --git a/home/shell.nix b/home-manager/shell.nix similarity index 100% rename from home/shell.nix rename to home-manager/shell.nix diff --git a/home/ssh.nix b/home-manager/ssh.nix similarity index 100% rename from home/ssh.nix rename to home-manager/ssh.nix diff --git a/home/terminal.nix b/home-manager/terminal.nix similarity index 100% rename from home/terminal.nix rename to home-manager/terminal.nix diff --git a/home/tmux.nix b/home-manager/tmux.nix similarity index 100% rename from home/tmux.nix rename to home-manager/tmux.nix diff --git a/home/xdg-dirs.nix b/home-manager/xdg-dirs.nix similarity index 100% rename from home/xdg-dirs.nix rename to home-manager/xdg-dirs.nix diff --git a/computational/configuration.nix b/nixos/computational/configuration.nix similarity index 100% rename from computational/configuration.nix rename to nixos/computational/configuration.nix diff --git a/computational/hardware-configuration.nix b/nixos/computational/hardware-configuration.nix similarity index 100% rename from computational/hardware-configuration.nix rename to nixos/computational/hardware-configuration.nix diff --git a/lambda/configuration.nix b/nixos/lambda/configuration.nix similarity index 97% rename from lambda/configuration.nix rename to nixos/lambda/configuration.nix index b1e20d8..0fe994c 100644 --- a/lambda/configuration.nix +++ b/nixos/lambda/configuration.nix @@ -36,7 +36,7 @@ device = "nodev"; efiSupport = true; enableCryptodisk = true; - theme = ../shared/sayonara; + theme = ../../resources/grub-theme; }; boot.loader.efi.efiSysMountPoint = "/boot/efi"; diff --git a/lambda/hardware-configuration.nix b/nixos/lambda/hardware-configuration.nix similarity index 100% rename from lambda/hardware-configuration.nix rename to nixos/lambda/hardware-configuration.nix diff --git a/shared/graphical.nix b/nixos/shared/graphical.nix similarity index 100% rename from shared/graphical.nix rename to nixos/shared/graphical.nix diff --git a/shared/user-system.nix b/nixos/shared/user-system.nix similarity index 94% rename from shared/user-system.nix rename to nixos/shared/user-system.nix index ee096d6..a972788 100644 --- a/shared/user-system.nix +++ b/nixos/shared/user-system.nix @@ -39,7 +39,7 @@ }; fileSystems."/mnt/eta" = - let secrets = import ../secrets/eta.nix; + let secrets = import ../../secrets/eta.nix; in { device = "//192.168.30.33/users"; fsType = "cifs"; @@ -53,12 +53,12 @@ extraLayouts.sus = { description = "Swedish US"; languages = [ "se" ]; - symbolsFile = ../shared/sus.xkb; + symbolsFile = ../../resources/sus.xkb; }; extraLayouts.fox = { description = "Layout suitable to be used by a fox"; languages = [ "se" ]; - symbolsFile = ../shared/fox.xkb; + symbolsFile = ../../resources/fox.xkb; }; }; }; diff --git a/shared/fox.xkb b/resources/fox.xkb similarity index 100% rename from shared/fox.xkb rename to resources/fox.xkb diff --git a/shared/sayonara/background.png b/resources/grub-theme/background.png similarity index 100% rename from shared/sayonara/background.png rename to resources/grub-theme/background.png diff --git a/shared/sayonara/info.png b/resources/grub-theme/info.png similarity index 100% rename from shared/sayonara/info.png rename to resources/grub-theme/info.png diff --git a/shared/sayonara/theme.txt b/resources/grub-theme/theme.txt similarity index 100% rename from shared/sayonara/theme.txt rename to resources/grub-theme/theme.txt diff --git a/shared/sayonara/victor-pixel-32.pf2 b/resources/grub-theme/victor-pixel-32.pf2 similarity index 100% rename from shared/sayonara/victor-pixel-32.pf2 rename to resources/grub-theme/victor-pixel-32.pf2 diff --git a/shared/sus.xkb b/resources/sus.xkb similarity index 100% rename from shared/sus.xkb rename to resources/sus.xkb diff --git a/shared/.gitignore b/shared/.gitignore deleted file mode 100644 index 89b3a77..0000000 --- a/shared/.gitignore +++ /dev/null @@ -1 +0,0 @@ -secrets.nix