From e06aa045b4e3befc1c8a66d48f12870fe5e80468 Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Tue, 18 Jun 2024 14:40:06 +0300 Subject: [PATCH] Reorganize modules Signed-off-by: Nikolaos Karaolidis --- .../{neovim.nix => neovim/default.nix} | 0 .../configs/{tmux.nix => tmux/default.nix} | 0 .../configs/{zsh.nix => zsh/default.nix} | 0 hosts/common/default.nix | 6 ++-- .../{pipewire.nix => pipewire/default.nix} | 0 hosts/eirene/default.nix | 2 +- hosts/eirene/vm/default.nix | 7 +++-- .../{firefox.nix => firefox/default.nix} | 0 .../configs/{git.nix => git/default.nix} | 0 .../{hyprland.nix => hyprland/default.nix} | 31 +++++++++++++++++++ .../configs/{kitty.nix => kitty/default.nix} | 0 .../{stylix.nix => stylix/default.nix} | 0 .../configs/{zsh.nix => zsh/default.nix} | 5 --- users/common/default.nix | 24 +++++++------- users/nick/default.nix | 2 +- 15 files changed, 52 insertions(+), 25 deletions(-) rename hosts/common/configs/{neovim.nix => neovim/default.nix} (100%) rename hosts/common/configs/{tmux.nix => tmux/default.nix} (100%) rename hosts/common/configs/{zsh.nix => zsh/default.nix} (100%) rename hosts/eirene/configs/{pipewire.nix => pipewire/default.nix} (100%) rename users/common/configs/{firefox.nix => firefox/default.nix} (100%) rename users/common/configs/{git.nix => git/default.nix} (100%) rename users/common/configs/{hyprland.nix => hyprland/default.nix} (63%) rename users/common/configs/{kitty.nix => kitty/default.nix} (100%) rename users/common/configs/{stylix.nix => stylix/default.nix} (100%) rename users/common/configs/{zsh.nix => zsh/default.nix} (61%) diff --git a/hosts/common/configs/neovim.nix b/hosts/common/configs/neovim/default.nix similarity index 100% rename from hosts/common/configs/neovim.nix rename to hosts/common/configs/neovim/default.nix diff --git a/hosts/common/configs/tmux.nix b/hosts/common/configs/tmux/default.nix similarity index 100% rename from hosts/common/configs/tmux.nix rename to hosts/common/configs/tmux/default.nix diff --git a/hosts/common/configs/zsh.nix b/hosts/common/configs/zsh/default.nix similarity index 100% rename from hosts/common/configs/zsh.nix rename to hosts/common/configs/zsh/default.nix diff --git a/hosts/common/default.nix b/hosts/common/default.nix index def73f6..6375ae6 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -4,9 +4,9 @@ imports = [ inputs.impermanence.nixosModules.impermanence inputs.sops-nix.nixosModules.sops - ./configs/zsh.nix - ./configs/neovim.nix - ./configs/tmux.nix + ./configs/zsh + ./configs/neovim + ./configs/tmux ]; fileSystems."/persist".neededForBoot = true; diff --git a/hosts/eirene/configs/pipewire.nix b/hosts/eirene/configs/pipewire/default.nix similarity index 100% rename from hosts/eirene/configs/pipewire.nix rename to hosts/eirene/configs/pipewire/default.nix diff --git a/hosts/eirene/default.nix b/hosts/eirene/default.nix index f0da195..655df01 100644 --- a/hosts/eirene/default.nix +++ b/hosts/eirene/default.nix @@ -4,7 +4,7 @@ imports = [ ../common ../../users/nick - ./configs/pipewire.nix + ./configs/pipewire ]; time.timeZone = "Europe/Athens"; diff --git a/hosts/eirene/vm/default.nix b/hosts/eirene/vm/default.nix index 3c5df7e..6a6fdcc 100644 --- a/hosts/eirene/vm/default.nix +++ b/hosts/eirene/vm/default.nix @@ -1,20 +1,21 @@ -{ inputs, ... }: +{ config, inputs, lib, ... }: { imports = [ inputs.disko.nixosModules.disko (import ../format.nix { device = "/dev/vda"; }) ./hardware-configuration.nix - ../default.nix + ../. ]; networking.hostName = "eirene-vm"; boot.kernelParams = [ "video=Virtual-1:2560x1600@60" ]; - home-manager.sharedModules = [{ wayland.windowManager.hyprland.settings.monitor = "Virtual-1, 2560x1600@60, 0x0, 1"; }]; fileSystems."/host" = { device = "host"; fsType = "virtiofs"; }; + + home-manager.sharedModules = lib.mkIf config.programs.hyprland.enable [{ wayland.windowManager.hyprland.settings.monitor = "Virtual-1, 2560x1600@60, 0x0, 1"; }]; } diff --git a/users/common/configs/firefox.nix b/users/common/configs/firefox/default.nix similarity index 100% rename from users/common/configs/firefox.nix rename to users/common/configs/firefox/default.nix diff --git a/users/common/configs/git.nix b/users/common/configs/git/default.nix similarity index 100% rename from users/common/configs/git.nix rename to users/common/configs/git/default.nix diff --git a/users/common/configs/hyprland.nix b/users/common/configs/hyprland/default.nix similarity index 63% rename from users/common/configs/hyprland.nix rename to users/common/configs/hyprland/default.nix index 53fda3c..7bc31cb 100644 --- a/users/common/configs/hyprland.nix +++ b/users/common/configs/hyprland/default.nix @@ -10,6 +10,30 @@ "$mod, r, exec, rofi -show drun" "$mod, b, exec, firefox" + "$mod, 1, workspace, 1" + "$mod, 2, workspace, 2" + "$mod, 3, workspace, 3" + "$mod, 4, workspace, 4" + "$mod, 5, workspace, 5" + "$mod, 6, workspace, 6" + "$mod, 7, workspace, 7" + "$mod, 8, workspace, 8" + "$mod, 9, workspace, 9" + "$mod, 0, workspace, 10" + + "$mod_SHIFT, 1, movetoworkspace, 1" + "$mod_SHIFT, 2, movetoworkspace, 2" + "$mod_SHIFT, 3, movetoworkspace, 3" + "$mod_SHIFT, 4, movetoworkspace, 4" + "$mod_SHIFT, 5, movetoworkspace, 5" + "$mod_SHIFT, 6, movetoworkspace, 6" + "$mod_SHIFT, 7, movetoworkspace, 7" + "$mod_SHIFT, 8, movetoworkspace, 8" + "$mod_SHIFT, 9, movetoworkspace, 9" + "$mod_SHIFT, 0, movetoworkspace, 10" + + "$mod_CTRL, Space, workspaceopt, allfloat" + "$mod, left, movefocus, l" "$mod, h, movefocus, l" "$mod, down, movefocus, d" @@ -43,6 +67,7 @@ "$mod_SHIFT, Tab, bringactivetotop" "$mod, f, fullscreen, 0" + "$mod, p, pin" "$mod, Space, togglefloating" "$mod, Space, centerwindow" "$mod, q, killactive" @@ -61,4 +86,10 @@ }; }; }; + + programs.zsh.loginExtra = '' + if [ -z "''${WAYLAND_DISPLAY}" ] && [ ! -z "''${XDG_VTNR}" ] && [ "''${XDG_VTNR}" -eq 1 ]; then + hyprland &> /tmp/hyprland.log + fi + ''; } diff --git a/users/common/configs/kitty.nix b/users/common/configs/kitty/default.nix similarity index 100% rename from users/common/configs/kitty.nix rename to users/common/configs/kitty/default.nix diff --git a/users/common/configs/stylix.nix b/users/common/configs/stylix/default.nix similarity index 100% rename from users/common/configs/stylix.nix rename to users/common/configs/stylix/default.nix diff --git a/users/common/configs/zsh.nix b/users/common/configs/zsh/default.nix similarity index 61% rename from users/common/configs/zsh.nix rename to users/common/configs/zsh/default.nix index 7b014b9..05ee43b 100644 --- a/users/common/configs/zsh.nix +++ b/users/common/configs/zsh/default.nix @@ -9,10 +9,5 @@ historySubstringSearch.enable = true; autosuggestion.enable = true; syntaxHighlighting.enable = true; - loginExtra = '' - if [ -z "''${WAYLAND_DISPLAY}" ] && [ ! -z "''${XDG_VTNR}" ] && [ "''${XDG_VTNR}" -eq 1 ]; then - hyprland &> /tmp/hyprland.log - fi - ''; }; } diff --git a/users/common/default.nix b/users/common/default.nix index caad225..d146f84 100644 --- a/users/common/default.nix +++ b/users/common/default.nix @@ -22,12 +22,12 @@ in imports = [ inputs.impermanence.nixosModules.home-manager.impermanence inputs.stylix.homeManagerModules.stylix - ./configs/stylix.nix - ./configs/hyprland.nix - ./configs/git.nix - ./configs/zsh.nix - ./configs/kitty.nix - ./configs/firefox.nix + ./configs/stylix + ./configs/hyprland + ./configs/git + ./configs/zsh + ./configs/kitty + ./configs/firefox ]; home = { @@ -41,13 +41,8 @@ in systemd.user.startServices = "sd-switch"; }]; - }; - systemd.tmpfiles.rules = [ "d /persist/home/ 0755 root root -" ] ++ lib.attrsets.mapAttrsToList (user: config: - "d /persist${config.home} 0700 ${user} users -" - ) normalUsers; - - home-manager.users = lib.attrsets.mapAttrs' (user: config: lib.attrsets.nameValuePair + users = lib.attrsets.mapAttrs' (user: config: lib.attrsets.nameValuePair (user) (let init = pkgs.pkgs.writeShellScriptBin "hyprland-init" '' @@ -92,5 +87,10 @@ in wayland.windowManager.hyprland.settings.exec-once = "${init}/bin/hyprland-init"; }) + ) normalUsers; + }; + + systemd.tmpfiles.rules = [ "d /persist/home/ 0755 root root -" ] ++ lib.attrsets.mapAttrsToList (user: config: + "d /persist${config.home} 0700 ${user} users -" ) normalUsers; } diff --git a/users/nick/default.nix b/users/nick/default.nix index 2232f9c..1290812 100644 --- a/users/nick/default.nix +++ b/users/nick/default.nix @@ -20,6 +20,6 @@ linger = true; uid = 1000; wallpaper = ./wallpapers/clouds.png; - base16Scheme = "${pkgs.base16-schemes}/share/themes/da-one-sea.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/seti.yaml"; }; }