From 6c60cd8e8b270c2be3f19f30022a0f9791009c0f Mon Sep 17 00:00:00 2001 From: Mohammad Rafiq Date: Thu, 27 Mar 2025 03:19:25 +0800 Subject: [PATCH] refactor: centralise all modules --- {systems/modules => configs}/boot.nix | 0 .../bootloaders/systemd-boot.nix | 0 configs/default.nix | 37 ++++++ .../modules => configs}/hardware/audio.nix | 0 .../hardware/bluetooth.nix | 0 .../modules => configs}/hardware/cpu_amd.nix | 0 .../modules => configs}/hardware/nvidia.nix | 0 {systems => configs}/hw-nemesis.nix | 0 {systems/modules => configs}/impermanence.nix | 0 {media => configs/media}/wallpaper.jpg | Bin {systems/modules => configs}/networking.nix | 0 .../modules/nix.nix => configs/nix-config.nix | 0 .../modules => configs}/programs/getty.nix | 0 .../modules => configs}/programs/hyprland.nix | 0 .../modules => configs}/programs/hyprlock.nix | 0 {systems/modules => configs}/programs/zsh.nix | 0 {users => configs}/scripts/byebye.sh | 0 {users => configs}/scripts/default.nix | 0 {users => configs}/scripts/git-extract.py | 0 {users => configs}/scripts/rebuild.sh | 0 .sops.yaml => configs/secrets/.sops.yaml | 0 {secrets => configs/secrets}/secrets.yaml | 0 {systems/modules => configs}/security.nix | 2 +- {systems/modules => configs}/stylix.nix | 2 +- .../themes/colourschemes/3024.nix | 0 .../themes/colourschemes/black-metal.nix | 0 .../themes/colourschemes/bright.nix | 0 .../themes/colourschemes/catppuccin-mocha.nix | 0 .../themes/colourschemes/darkviolet.nix | 0 .../themes/cursors/banana-cursor.nix | 0 .../themes/cursors/wii-cursor.nix | 0 .../themes/fonts/0xProto.nix | 0 .../modules => configs}/themes/fonts/3270.nix | 0 .../themes/fonts/sauce-code-pro.nix | 0 .../themes/fonts/terminess.nix | 0 configs/users.nix | 111 ++++++++++++++++++ flake.nix | 2 +- {users/programs => programs_temp}/ags.nix | 0 {users/programs => programs_temp}/ags/test | 0 {users/programs => programs_temp}/btop.nix | 0 {users/programs => programs_temp}/clipse.nix | 0 {users/programs => programs_temp}/comma.nix | 0 {users/programs => programs_temp}/direnv.nix | 0 {users/programs => programs_temp}/dunst.nix | 0 {users/programs => programs_temp}/firefox.nix | 0 {users/programs => programs_temp}/fuzzel.nix | 0 {users/programs => programs_temp}/fzf.nix | 0 {users/programs => programs_temp}/git.nix | 0 .../programs => programs_temp}/hyprland.nix | 0 .../programs => programs_temp}/hyprshade.nix | 0 {users/programs => programs_temp}/kitty.nix | 0 {users/programs => programs_temp}/nh.nix | 0 {users/programs => programs_temp}/nvf.nix | 0 .../programs => programs_temp}/nvf/input.nix | 0 .../nvf/languages.nix | 0 {users/programs => programs_temp}/nvf/ui.nix | 0 .../nvf/utilities.nix | 0 .../programs => programs_temp}/spicetify.nix | 0 .../programs => programs_temp}/starship.nix | 0 .../programs => programs_temp}/tealdeer.nix | 0 {users/programs => programs_temp}/yazi.nix | 0 .../yazi/starship.toml | 0 {users/programs => programs_temp}/zellij.nix | 0 {users/programs => programs_temp}/zoxide.nix | 0 {users/programs => programs_temp}/zsh.nix | 0 systems/default.nix | 37 ------ systems/modules/users.nix | 27 ----- users/programs/thefuck.nix | 3 - users/programs/tmux.nix | 32 ----- users/rafiq.nix | 86 -------------- 70 files changed, 151 insertions(+), 188 deletions(-) rename {systems/modules => configs}/boot.nix (100%) rename {systems/modules => configs}/bootloaders/systemd-boot.nix (100%) create mode 100644 configs/default.nix rename {systems/modules => configs}/hardware/audio.nix (100%) rename {systems/modules => configs}/hardware/bluetooth.nix (100%) rename {systems/modules => configs}/hardware/cpu_amd.nix (100%) rename {systems/modules => configs}/hardware/nvidia.nix (100%) rename {systems => configs}/hw-nemesis.nix (100%) rename {systems/modules => configs}/impermanence.nix (100%) rename {media => configs/media}/wallpaper.jpg (100%) rename {systems/modules => configs}/networking.nix (100%) rename systems/modules/nix.nix => configs/nix-config.nix (100%) rename {systems/modules => configs}/programs/getty.nix (100%) rename {systems/modules => configs}/programs/hyprland.nix (100%) rename {systems/modules => configs}/programs/hyprlock.nix (100%) rename {systems/modules => configs}/programs/zsh.nix (100%) rename {users => configs}/scripts/byebye.sh (100%) rename {users => configs}/scripts/default.nix (100%) rename {users => configs}/scripts/git-extract.py (100%) rename {users => configs}/scripts/rebuild.sh (100%) rename .sops.yaml => configs/secrets/.sops.yaml (100%) rename {secrets => configs/secrets}/secrets.yaml (100%) rename {systems/modules => configs}/security.nix (77%) rename {systems/modules => configs}/stylix.nix (95%) rename {systems/modules => configs}/themes/colourschemes/3024.nix (100%) rename {systems/modules => configs}/themes/colourschemes/black-metal.nix (100%) rename {systems/modules => configs}/themes/colourschemes/bright.nix (100%) rename {systems/modules => configs}/themes/colourschemes/catppuccin-mocha.nix (100%) rename {systems/modules => configs}/themes/colourschemes/darkviolet.nix (100%) rename {systems/modules => configs}/themes/cursors/banana-cursor.nix (100%) rename {systems/modules => configs}/themes/cursors/wii-cursor.nix (100%) rename {systems/modules => configs}/themes/fonts/0xProto.nix (100%) rename {systems/modules => configs}/themes/fonts/3270.nix (100%) rename {systems/modules => configs}/themes/fonts/sauce-code-pro.nix (100%) rename {systems/modules => configs}/themes/fonts/terminess.nix (100%) create mode 100644 configs/users.nix rename {users/programs => programs_temp}/ags.nix (100%) rename {users/programs => programs_temp}/ags/test (100%) rename {users/programs => programs_temp}/btop.nix (100%) rename {users/programs => programs_temp}/clipse.nix (100%) rename {users/programs => programs_temp}/comma.nix (100%) rename {users/programs => programs_temp}/direnv.nix (100%) rename {users/programs => programs_temp}/dunst.nix (100%) rename {users/programs => programs_temp}/firefox.nix (100%) rename {users/programs => programs_temp}/fuzzel.nix (100%) rename {users/programs => programs_temp}/fzf.nix (100%) rename {users/programs => programs_temp}/git.nix (100%) rename {users/programs => programs_temp}/hyprland.nix (100%) rename {users/programs => programs_temp}/hyprshade.nix (100%) rename {users/programs => programs_temp}/kitty.nix (100%) rename {users/programs => programs_temp}/nh.nix (100%) rename {users/programs => programs_temp}/nvf.nix (100%) rename {users/programs => programs_temp}/nvf/input.nix (100%) rename {users/programs => programs_temp}/nvf/languages.nix (100%) rename {users/programs => programs_temp}/nvf/ui.nix (100%) rename {users/programs => programs_temp}/nvf/utilities.nix (100%) rename {users/programs => programs_temp}/spicetify.nix (100%) rename {users/programs => programs_temp}/starship.nix (100%) rename {users/programs => programs_temp}/tealdeer.nix (100%) rename {users/programs => programs_temp}/yazi.nix (100%) rename {users/programs => programs_temp}/yazi/starship.toml (100%) rename {users/programs => programs_temp}/zellij.nix (100%) rename {users/programs => programs_temp}/zoxide.nix (100%) rename {users/programs => programs_temp}/zsh.nix (100%) delete mode 100644 systems/default.nix delete mode 100644 systems/modules/users.nix delete mode 100644 users/programs/thefuck.nix delete mode 100644 users/programs/tmux.nix delete mode 100644 users/rafiq.nix diff --git a/systems/modules/boot.nix b/configs/boot.nix similarity index 100% rename from systems/modules/boot.nix rename to configs/boot.nix diff --git a/systems/modules/bootloaders/systemd-boot.nix b/configs/bootloaders/systemd-boot.nix similarity index 100% rename from systems/modules/bootloaders/systemd-boot.nix rename to configs/bootloaders/systemd-boot.nix diff --git a/configs/default.nix b/configs/default.nix new file mode 100644 index 0000000..21e289b --- /dev/null +++ b/configs/default.nix @@ -0,0 +1,37 @@ +{ + lib, + hostname, + type, + modulesPath, + ... +}: +{ + imports = builtins.concatLists [ + # Common options for all machines. + [ + (modulesPath + "/installer/scan/not-detected.nix") + ./boot.nix + ./networking.nix + ./nix-config.nix + ./programs/zsh.nix + ./security.nix + ./users.nix + ] + # Options for graphical systems. + (lib.optionals (type == "desktop") [ + ./hardware/audio.nix + ./hardware/bluetooth.nix + ./programs/getty.nix + ./programs/hyprland.nix + ./programs/hyprlock.nix + ./stylix.nix + ]) + # Options for specific hostnames. + (lib.optionals (hostname == "nemesis") [ + ./hw-nemesis.nix + ./bootloaders/systemd-boot.nix + ./hardware/cpu_amd.nix + ./hardware/nvidia.nix + ]) + ]; +} diff --git a/systems/modules/hardware/audio.nix b/configs/hardware/audio.nix similarity index 100% rename from systems/modules/hardware/audio.nix rename to configs/hardware/audio.nix diff --git a/systems/modules/hardware/bluetooth.nix b/configs/hardware/bluetooth.nix similarity index 100% rename from systems/modules/hardware/bluetooth.nix rename to configs/hardware/bluetooth.nix diff --git a/systems/modules/hardware/cpu_amd.nix b/configs/hardware/cpu_amd.nix similarity index 100% rename from systems/modules/hardware/cpu_amd.nix rename to configs/hardware/cpu_amd.nix diff --git a/systems/modules/hardware/nvidia.nix b/configs/hardware/nvidia.nix similarity index 100% rename from systems/modules/hardware/nvidia.nix rename to configs/hardware/nvidia.nix diff --git a/systems/hw-nemesis.nix b/configs/hw-nemesis.nix similarity index 100% rename from systems/hw-nemesis.nix rename to configs/hw-nemesis.nix diff --git a/systems/modules/impermanence.nix b/configs/impermanence.nix similarity index 100% rename from systems/modules/impermanence.nix rename to configs/impermanence.nix diff --git a/media/wallpaper.jpg b/configs/media/wallpaper.jpg similarity index 100% rename from media/wallpaper.jpg rename to configs/media/wallpaper.jpg diff --git a/systems/modules/networking.nix b/configs/networking.nix similarity index 100% rename from systems/modules/networking.nix rename to configs/networking.nix diff --git a/systems/modules/nix.nix b/configs/nix-config.nix similarity index 100% rename from systems/modules/nix.nix rename to configs/nix-config.nix diff --git a/systems/modules/programs/getty.nix b/configs/programs/getty.nix similarity index 100% rename from systems/modules/programs/getty.nix rename to configs/programs/getty.nix diff --git a/systems/modules/programs/hyprland.nix b/configs/programs/hyprland.nix similarity index 100% rename from systems/modules/programs/hyprland.nix rename to configs/programs/hyprland.nix diff --git a/systems/modules/programs/hyprlock.nix b/configs/programs/hyprlock.nix similarity index 100% rename from systems/modules/programs/hyprlock.nix rename to configs/programs/hyprlock.nix diff --git a/systems/modules/programs/zsh.nix b/configs/programs/zsh.nix similarity index 100% rename from systems/modules/programs/zsh.nix rename to configs/programs/zsh.nix diff --git a/users/scripts/byebye.sh b/configs/scripts/byebye.sh similarity index 100% rename from users/scripts/byebye.sh rename to configs/scripts/byebye.sh diff --git a/users/scripts/default.nix b/configs/scripts/default.nix similarity index 100% rename from users/scripts/default.nix rename to configs/scripts/default.nix diff --git a/users/scripts/git-extract.py b/configs/scripts/git-extract.py similarity index 100% rename from users/scripts/git-extract.py rename to configs/scripts/git-extract.py diff --git a/users/scripts/rebuild.sh b/configs/scripts/rebuild.sh similarity index 100% rename from users/scripts/rebuild.sh rename to configs/scripts/rebuild.sh diff --git a/.sops.yaml b/configs/secrets/.sops.yaml similarity index 100% rename from .sops.yaml rename to configs/secrets/.sops.yaml diff --git a/secrets/secrets.yaml b/configs/secrets/secrets.yaml similarity index 100% rename from secrets/secrets.yaml rename to configs/secrets/secrets.yaml diff --git a/systems/modules/security.nix b/configs/security.nix similarity index 77% rename from systems/modules/security.nix rename to configs/security.nix index 4fafcfb..0ae8e0a 100644 --- a/systems/modules/security.nix +++ b/configs/security.nix @@ -1,6 +1,6 @@ { sops = { - defaultSopsFile = ../../secrets/secrets.yaml; + defaultSopsFile = ./secrets/secrets.yaml; age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; secrets.password.neededForUsers = true; }; diff --git a/systems/modules/stylix.nix b/configs/stylix.nix similarity index 95% rename from systems/modules/stylix.nix rename to configs/stylix.nix index 1dade38..9345acf 100644 --- a/systems/modules/stylix.nix +++ b/configs/stylix.nix @@ -9,7 +9,7 @@ let # Put options that exist in both NixOS and home-manager modules here. stylix = { enable = true; - image = ../../media/wallpaper.jpg; + image = ./media/wallpaper.jpg; opacity = { applications = opacity; desktop = opacity; diff --git a/systems/modules/themes/colourschemes/3024.nix b/configs/themes/colourschemes/3024.nix similarity index 100% rename from systems/modules/themes/colourschemes/3024.nix rename to configs/themes/colourschemes/3024.nix diff --git a/systems/modules/themes/colourschemes/black-metal.nix b/configs/themes/colourschemes/black-metal.nix similarity index 100% rename from systems/modules/themes/colourschemes/black-metal.nix rename to configs/themes/colourschemes/black-metal.nix diff --git a/systems/modules/themes/colourschemes/bright.nix b/configs/themes/colourschemes/bright.nix similarity index 100% rename from systems/modules/themes/colourschemes/bright.nix rename to configs/themes/colourschemes/bright.nix diff --git a/systems/modules/themes/colourschemes/catppuccin-mocha.nix b/configs/themes/colourschemes/catppuccin-mocha.nix similarity index 100% rename from systems/modules/themes/colourschemes/catppuccin-mocha.nix rename to configs/themes/colourschemes/catppuccin-mocha.nix diff --git a/systems/modules/themes/colourschemes/darkviolet.nix b/configs/themes/colourschemes/darkviolet.nix similarity index 100% rename from systems/modules/themes/colourschemes/darkviolet.nix rename to configs/themes/colourschemes/darkviolet.nix diff --git a/systems/modules/themes/cursors/banana-cursor.nix b/configs/themes/cursors/banana-cursor.nix similarity index 100% rename from systems/modules/themes/cursors/banana-cursor.nix rename to configs/themes/cursors/banana-cursor.nix diff --git a/systems/modules/themes/cursors/wii-cursor.nix b/configs/themes/cursors/wii-cursor.nix similarity index 100% rename from systems/modules/themes/cursors/wii-cursor.nix rename to configs/themes/cursors/wii-cursor.nix diff --git a/systems/modules/themes/fonts/0xProto.nix b/configs/themes/fonts/0xProto.nix similarity index 100% rename from systems/modules/themes/fonts/0xProto.nix rename to configs/themes/fonts/0xProto.nix diff --git a/systems/modules/themes/fonts/3270.nix b/configs/themes/fonts/3270.nix similarity index 100% rename from systems/modules/themes/fonts/3270.nix rename to configs/themes/fonts/3270.nix diff --git a/systems/modules/themes/fonts/sauce-code-pro.nix b/configs/themes/fonts/sauce-code-pro.nix similarity index 100% rename from systems/modules/themes/fonts/sauce-code-pro.nix rename to configs/themes/fonts/sauce-code-pro.nix diff --git a/systems/modules/themes/fonts/terminess.nix b/configs/themes/fonts/terminess.nix similarity index 100% rename from systems/modules/themes/fonts/terminess.nix rename to configs/themes/fonts/terminess.nix diff --git a/configs/users.nix b/configs/users.nix new file mode 100644 index 0000000..69924cd --- /dev/null +++ b/configs/users.nix @@ -0,0 +1,111 @@ +{ + inputs, + config, + specialArgs, + pkgs, + ... +}: +{ + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = specialArgs; + }; + + users.mutableUsers = false; # Always reset users on system activation + + time.timeZone = "Asia/Singapore"; + i18n.defaultLocale = "en_SG.UTF-8"; + + home-manager.users.rafiq.imports = [ + ../programs_temp/ags.nix + ../programs_temp/btop.nix + ../programs_temp/clipse.nix + ../programs_temp/comma.nix + ../programs_temp/direnv.nix + ../programs_temp/dunst.nix + ../programs_temp/firefox.nix + ../programs_temp/fuzzel.nix + ../programs_temp/fzf.nix + ../programs_temp/git.nix + ../programs_temp/hyprland.nix + ../programs_temp/hyprshade.nix + ../programs_temp/kitty.nix + ../programs_temp/nh.nix + ../programs_temp/nvf.nix + ../programs_temp/spicetify.nix + ../programs_temp/starship.nix + ../programs_temp/tealdeer.nix + ../programs_temp/yazi.nix + ../programs_temp/zellij.nix + ../programs_temp/zoxide.nix + ../programs_temp/zsh.nix + ./scripts + { + # This enables using home-manager from the command line. + programs.home-manager.enable = true; + + editorconfig = { + enable = true; + settings = { + "*" = { + end_of_line = "lf"; + insert_final_newline = true; + trim_trailing_whitespace = true; + charset = "utf-8"; + indent_style = "space"; + indent_size = 2; + }; + "package.json" = { + indent_style = "unset"; + }; + "*.lock" = { + indent_size = "unset"; + }; + }; + }; + + home = { + username = "rafiq"; + homeDirectory = "/home/rafiq"; + + # This defines the version home-manager + # was originally bulit against on this system. + # Do not change it. + stateVersion = "25.05"; + + shell.enableShellIntegration = true; + shellAliases = { + gs = "git status"; + ai = "aichat -r %shell% -e"; + cd = "z"; + list-all-packages = "nix-store --query --requisites /run/current-system | cut -d- -f2- | sort | uniq"; + }; + + packages = with pkgs; [ + fastfetch # system info + wl-clipboard # provides cli copy and paste commands + aichat # duh + ripgrep + devenv + bat + ttyper + hyprpicker + inputs.hyprcloser.packages.${pkgs.stdenv.hostPlatform.system}.default + ]; + }; + } + ]; + users.users.rafiq = { + isNormalUser = true; + description = "rafiq"; + hashedPasswordFile = config.sops.secrets.password.path; + extraGroups = [ + "networkmanager" + "wheel" + ]; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILdsZyY3gu8IGB8MzMnLdh+ClDxQQ2RYG9rkeetIKq8n" + ]; + }; +} diff --git a/flake.nix b/flake.nix index 4b0c851..bc6aca9 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,7 @@ inputs.nixpkgs.lib.nixosSystem { specialArgs = args; modules = [ - ./systems + ./configs inputs.home-manager.nixosModules.home-manager inputs.sops-nix.nixosModules.sops ]; diff --git a/users/programs/ags.nix b/programs_temp/ags.nix similarity index 100% rename from users/programs/ags.nix rename to programs_temp/ags.nix diff --git a/users/programs/ags/test b/programs_temp/ags/test similarity index 100% rename from users/programs/ags/test rename to programs_temp/ags/test diff --git a/users/programs/btop.nix b/programs_temp/btop.nix similarity index 100% rename from users/programs/btop.nix rename to programs_temp/btop.nix diff --git a/users/programs/clipse.nix b/programs_temp/clipse.nix similarity index 100% rename from users/programs/clipse.nix rename to programs_temp/clipse.nix diff --git a/users/programs/comma.nix b/programs_temp/comma.nix similarity index 100% rename from users/programs/comma.nix rename to programs_temp/comma.nix diff --git a/users/programs/direnv.nix b/programs_temp/direnv.nix similarity index 100% rename from users/programs/direnv.nix rename to programs_temp/direnv.nix diff --git a/users/programs/dunst.nix b/programs_temp/dunst.nix similarity index 100% rename from users/programs/dunst.nix rename to programs_temp/dunst.nix diff --git a/users/programs/firefox.nix b/programs_temp/firefox.nix similarity index 100% rename from users/programs/firefox.nix rename to programs_temp/firefox.nix diff --git a/users/programs/fuzzel.nix b/programs_temp/fuzzel.nix similarity index 100% rename from users/programs/fuzzel.nix rename to programs_temp/fuzzel.nix diff --git a/users/programs/fzf.nix b/programs_temp/fzf.nix similarity index 100% rename from users/programs/fzf.nix rename to programs_temp/fzf.nix diff --git a/users/programs/git.nix b/programs_temp/git.nix similarity index 100% rename from users/programs/git.nix rename to programs_temp/git.nix diff --git a/users/programs/hyprland.nix b/programs_temp/hyprland.nix similarity index 100% rename from users/programs/hyprland.nix rename to programs_temp/hyprland.nix diff --git a/users/programs/hyprshade.nix b/programs_temp/hyprshade.nix similarity index 100% rename from users/programs/hyprshade.nix rename to programs_temp/hyprshade.nix diff --git a/users/programs/kitty.nix b/programs_temp/kitty.nix similarity index 100% rename from users/programs/kitty.nix rename to programs_temp/kitty.nix diff --git a/users/programs/nh.nix b/programs_temp/nh.nix similarity index 100% rename from users/programs/nh.nix rename to programs_temp/nh.nix diff --git a/users/programs/nvf.nix b/programs_temp/nvf.nix similarity index 100% rename from users/programs/nvf.nix rename to programs_temp/nvf.nix diff --git a/users/programs/nvf/input.nix b/programs_temp/nvf/input.nix similarity index 100% rename from users/programs/nvf/input.nix rename to programs_temp/nvf/input.nix diff --git a/users/programs/nvf/languages.nix b/programs_temp/nvf/languages.nix similarity index 100% rename from users/programs/nvf/languages.nix rename to programs_temp/nvf/languages.nix diff --git a/users/programs/nvf/ui.nix b/programs_temp/nvf/ui.nix similarity index 100% rename from users/programs/nvf/ui.nix rename to programs_temp/nvf/ui.nix diff --git a/users/programs/nvf/utilities.nix b/programs_temp/nvf/utilities.nix similarity index 100% rename from users/programs/nvf/utilities.nix rename to programs_temp/nvf/utilities.nix diff --git a/users/programs/spicetify.nix b/programs_temp/spicetify.nix similarity index 100% rename from users/programs/spicetify.nix rename to programs_temp/spicetify.nix diff --git a/users/programs/starship.nix b/programs_temp/starship.nix similarity index 100% rename from users/programs/starship.nix rename to programs_temp/starship.nix diff --git a/users/programs/tealdeer.nix b/programs_temp/tealdeer.nix similarity index 100% rename from users/programs/tealdeer.nix rename to programs_temp/tealdeer.nix diff --git a/users/programs/yazi.nix b/programs_temp/yazi.nix similarity index 100% rename from users/programs/yazi.nix rename to programs_temp/yazi.nix diff --git a/users/programs/yazi/starship.toml b/programs_temp/yazi/starship.toml similarity index 100% rename from users/programs/yazi/starship.toml rename to programs_temp/yazi/starship.toml diff --git a/users/programs/zellij.nix b/programs_temp/zellij.nix similarity index 100% rename from users/programs/zellij.nix rename to programs_temp/zellij.nix diff --git a/users/programs/zoxide.nix b/programs_temp/zoxide.nix similarity index 100% rename from users/programs/zoxide.nix rename to programs_temp/zoxide.nix diff --git a/users/programs/zsh.nix b/programs_temp/zsh.nix similarity index 100% rename from users/programs/zsh.nix rename to programs_temp/zsh.nix diff --git a/systems/default.nix b/systems/default.nix deleted file mode 100644 index 70cb483..0000000 --- a/systems/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - hostname, - type, - modulesPath, - ... -}: -{ - imports = builtins.concatLists [ - # Common options for all machines. - [ - (modulesPath + "/installer/scan/not-detected.nix") - ./modules/boot.nix - ./modules/networking.nix - ./modules/nix.nix - ./modules/programs/zsh.nix - ./modules/security.nix - ./modules/users.nix - ] - # Options for graphical systems. - (lib.optionals (type == "desktop") [ - ./modules/hardware/audio.nix - ./modules/hardware/bluetooth.nix - ./modules/programs/getty.nix - ./modules/programs/hyprland.nix - ./modules/programs/hyprlock.nix - ./modules/stylix.nix - ]) - # Options for specific hostnames. - (lib.optionals (hostname == "nemesis") [ - ./hw-nemesis.nix - ./modules/bootloaders/systemd-boot.nix - ./modules/hardware/cpu_amd.nix - ./modules/hardware/nvidia.nix - ]) - ]; -} diff --git a/systems/modules/users.nix b/systems/modules/users.nix deleted file mode 100644 index 5b7c471..0000000 --- a/systems/modules/users.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ config, specialArgs, ... }: -{ - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - extraSpecialArgs = specialArgs; - }; - - users.mutableUsers = false; # Always reset users on system activation - - time.timeZone = "Asia/Singapore"; - i18n.defaultLocale = "en_SG.UTF-8"; - - home-manager.users.rafiq.imports = [ ../../users/rafiq.nix ]; - users.users.rafiq = { - isNormalUser = true; - description = "rafiq"; - hashedPasswordFile = config.sops.secrets.password.path; - extraGroups = [ - "networkmanager" - "wheel" - ]; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILdsZyY3gu8IGB8MzMnLdh+ClDxQQ2RYG9rkeetIKq8n" - ]; - }; -} diff --git a/users/programs/thefuck.nix b/users/programs/thefuck.nix deleted file mode 100644 index e1083a5..0000000 --- a/users/programs/thefuck.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - programs.thefuck.enable = true; -} diff --git a/users/programs/tmux.nix b/users/programs/tmux.nix deleted file mode 100644 index b948a75..0000000 --- a/users/programs/tmux.nix +++ /dev/null @@ -1,32 +0,0 @@ -{pkgs, ...}: { - # Terminal Multiplexing - programs.tmux = { - enable = true; - plugins = with pkgs.tmuxPlugins; [ - catppuccin - - # Session Management between Reboots - { - plugin = resurrect; - extraConfig = '' - set -g @resurrect-strategy-nvim 'session' - ''; - } - { - plugin = continuum; - extraConfig = '' - set -g @continuum-restore 'on' - ''; - } - ]; - extraConfig = '' - set -g default-terminal "tmux-256color" - set -ag terminal-overrides ",tmux-256color:RGB" - set -as terminal-features ",tmux-256color:RGB" - - # inherit environment variables from outside so that we can use wl-copy etc - setenv -g WAYLAND_DISPLAY "$WAYLAND_DISPLAY" - setenv -g XDG_RUNTIME_DIR "$XDG_RUNTIME_DIR" - ''; - }; -} diff --git a/users/rafiq.nix b/users/rafiq.nix deleted file mode 100644 index 7fadc87..0000000 --- a/users/rafiq.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ - pkgs, - inputs, - ... -}: -{ - imports = [ - ./programs/ags.nix - ./programs/btop.nix - ./programs/clipse.nix - ./programs/comma.nix - ./programs/direnv.nix - ./programs/dunst.nix - ./programs/firefox.nix - ./programs/fuzzel.nix - ./programs/fzf.nix - ./programs/git.nix - ./programs/hyprland.nix - ./programs/hyprshade.nix - ./programs/kitty.nix - ./programs/nh.nix - ./programs/nvf.nix - ./programs/spicetify.nix - ./programs/starship.nix - ./programs/tealdeer.nix - ./programs/thefuck.nix - ./programs/yazi.nix - ./programs/zellij.nix - ./programs/zoxide.nix - ./programs/zsh.nix - ./scripts - ]; - - # This enables using home-manager from the command line. - programs.home-manager.enable = true; - - editorconfig = { - enable = true; - settings = { - "*" = { - end_of_line = "lf"; - insert_final_newline = true; - trim_trailing_whitespace = true; - charset = "utf-8"; - indent_style = "space"; - indent_size = 2; - }; - "package.json" = { - indent_style = "unset"; - }; - "*.lock" = { - indent_size = "unset"; - }; - }; - }; - - home = { - username = "rafiq"; - homeDirectory = "/home/rafiq"; - - # This defines the version home-manager - # was originally bulit against on this system. - # Do not change it. - stateVersion = "25.05"; - - shell.enableShellIntegration = true; - shellAliases = { - gs = "git status"; - ai = "aichat -r %shell% -e"; - cd = "z"; - list-all-packages = "nix-store --query --requisites /run/current-system | cut -d- -f2- | sort | uniq"; - }; - - packages = with pkgs; [ - fastfetch # system info - wl-clipboard # provides cli copy and paste commands - aichat # duh - ripgrep - devenv - bat - ttyper - hyprpicker - inputs.hyprcloser.packages.${pkgs.stdenv.hostPlatform.system}.default - ]; - }; -}