From 70b6634137a5bd54b04d5f85879ef389b548ec0a Mon Sep 17 00:00:00 2001 From: fwastring Date: Sat, 6 Sep 2025 13:18:48 +0200 Subject: [PATCH] Moved all to moduler --- maskiner/desktop/configuration.nix | 6 +++--- maskiner/jobb/configuration.nix | 20 ++++++++++---------- maskiner/jobb/configuration.nix.bak | 4 ++-- maskiner/laptop/configuration.nix | 4 ++-- maskiner/macmini/configuration.nix | 2 +- maskiner/work-desktop/configuration.nix | 14 +++++++------- {shared => moduler}/aerc.nix | 0 {config => moduler}/base.nix | 0 {config => moduler}/btusb-add-mt7925.patch | 0 {config => moduler}/btusb.nix | 0 {config => moduler}/dev.nix | 0 {shared => moduler}/dmenu.nix | 2 +- {shared => moduler}/dunst.nix | 0 {shared => moduler}/dwm.nix | 0 {shared => moduler}/firefox.nix | 0 {shared => moduler}/fish.nix | 0 {shared => moduler}/git.nix | 0 {shared => moduler}/gtk.nix | 0 {config => moduler}/headless-home.nix | 0 {config => moduler}/home.nix | 0 {config => moduler}/hyprland.nix | 6 +++--- {config => moduler}/k3s.nix | 0 {shared => moduler}/k9s.nix | 0 {shared => moduler}/kitty.nix | 0 {shared => moduler}/lazygit.nix | 17 ----------------- {config => moduler}/lsp.nix | 0 {shared => moduler}/neovim.nix | 0 {config => moduler}/network.nix | 0 {shared => moduler}/nginx.nix | 0 {shared => moduler}/nixpkgs.nix | 0 {shared => moduler}/oh-my-posh.nix | 0 {shared => moduler}/openssh.nix | 0 {config => moduler}/programs-minimal.nix | 0 {config => moduler}/programs.nix | 0 {shared => moduler}/ssh.nix | 0 {shared => moduler}/st.nix | 0 {config => moduler}/sway.nix | 0 {config => moduler}/system.nix | 0 {shared => moduler}/tmux.nix | 12 ++++++------ {config => moduler}/users.nix | 0 {shared => moduler}/zathura.nix | 0 41 files changed, 35 insertions(+), 52 deletions(-) rename {shared => moduler}/aerc.nix (100%) rename {config => moduler}/base.nix (100%) rename {config => moduler}/btusb-add-mt7925.patch (100%) rename {config => moduler}/btusb.nix (100%) rename {config => moduler}/dev.nix (100%) rename {shared => moduler}/dmenu.nix (84%) rename {shared => moduler}/dunst.nix (100%) rename {shared => moduler}/dwm.nix (100%) rename {shared => moduler}/firefox.nix (100%) rename {shared => moduler}/fish.nix (100%) rename {shared => moduler}/git.nix (100%) rename {shared => moduler}/gtk.nix (100%) rename {config => moduler}/headless-home.nix (100%) rename {config => moduler}/home.nix (100%) rename {config => moduler}/hyprland.nix (98%) rename {config => moduler}/k3s.nix (100%) rename {shared => moduler}/k9s.nix (100%) rename {shared => moduler}/kitty.nix (100%) rename {shared => moduler}/lazygit.nix (55%) rename {config => moduler}/lsp.nix (100%) rename {shared => moduler}/neovim.nix (100%) rename {config => moduler}/network.nix (100%) rename {shared => moduler}/nginx.nix (100%) rename {shared => moduler}/nixpkgs.nix (100%) rename {shared => moduler}/oh-my-posh.nix (100%) rename {shared => moduler}/openssh.nix (100%) rename {config => moduler}/programs-minimal.nix (100%) rename {config => moduler}/programs.nix (100%) rename {shared => moduler}/ssh.nix (100%) rename {shared => moduler}/st.nix (100%) rename {config => moduler}/sway.nix (100%) rename {config => moduler}/system.nix (100%) rename {shared => moduler}/tmux.nix (90%) rename {config => moduler}/users.nix (100%) rename {shared => moduler}/zathura.nix (100%) diff --git a/maskiner/desktop/configuration.nix b/maskiner/desktop/configuration.nix index 1fa6e13..ab78280 100644 --- a/maskiner/desktop/configuration.nix +++ b/maskiner/desktop/configuration.nix @@ -11,9 +11,9 @@ # You can import other NixOS modules here imports = [ ./hardware-configuration.nix - ../../config/base.nix - ../../config/users.nix - ../../shared/nginx.nix + ../../moduler/base.nix + ../../moduler/users.nix + ../../moduler/nginx.nix ]; environment.systemPackages = with pkgs; [ diff --git a/maskiner/jobb/configuration.nix b/maskiner/jobb/configuration.nix index 88a531e..f3ad1da 100644 --- a/maskiner/jobb/configuration.nix +++ b/maskiner/jobb/configuration.nix @@ -11,24 +11,24 @@ ... }: let - btusb = pkgs.callPackage ../../config/btusb.nix { inherit (config.boot.kernelPackages) kernel; }; + btusb = pkgs.callPackage ../../moduler/btusb.nix { inherit (config.boot.kernelPackages) kernel; }; in { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix inputs.home-manager.nixosModules.home-manager - ../../config/users.nix - ../../config/network.nix - ../../config/programs.nix - ../../config/system.nix - ../../config/dev.nix - ../../config/lsp.nix - ../../config/sway.nix - ../../config/hyprland.nix + ../../moduler/users.nix + ../../moduler/network.nix + ../../moduler/programs.nix + ../../moduler/system.nix + ../../moduler/dev.nix + ../../moduler/lsp.nix + ../../moduler/sway.nix + ../../moduler/hyprland.nix ]; -home-manager.extraSpecialArgs = { inherit inputs; }; +home-manager.extraSpecialArgs = { inherit inputs pkgs; }; home-manager.users.fw = { imports = [ ./../../config/home.nix diff --git a/maskiner/jobb/configuration.nix.bak b/maskiner/jobb/configuration.nix.bak index 01744cb..0ea484e 100644 --- a/maskiner/jobb/configuration.nix.bak +++ b/maskiner/jobb/configuration.nix.bak @@ -11,8 +11,8 @@ # You can import other NixOS modules here imports = [ ./hardware-configuration.nix - ../../config/base.nix - ../../config/users.nix + ../../moduler/base.nix + ../../moduler/users.nix ]; environment.systemPackages = with pkgs; [ diff --git a/maskiner/laptop/configuration.nix b/maskiner/laptop/configuration.nix index aa10918..762036b 100644 --- a/maskiner/laptop/configuration.nix +++ b/maskiner/laptop/configuration.nix @@ -12,8 +12,8 @@ # You can import other NixOS modules here imports = [ ./hardware-configuration.nix - ../../config/base.nix - ../../config/users.nix + ../../moduler/base.nix + ../../moduler/users.nix ]; networking.hostName = myhostname; diff --git a/maskiner/macmini/configuration.nix b/maskiner/macmini/configuration.nix index 0f5f908..86f5acd 100644 --- a/maskiner/macmini/configuration.nix +++ b/maskiner/macmini/configuration.nix @@ -12,7 +12,7 @@ # You can import other NixOS modules here imports = [ ./hardware-configuration.nix - ../../config/users.nix + ../../moduler/users.nix ]; environment.systemPackages = with pkgs; [ diff --git a/maskiner/work-desktop/configuration.nix b/maskiner/work-desktop/configuration.nix index f053f2c..db8b728 100644 --- a/maskiner/work-desktop/configuration.nix +++ b/maskiner/work-desktop/configuration.nix @@ -12,13 +12,13 @@ # You can import other NixOS modules here imports = [ ./hardware-configuration.nix - ../../shared/openssh.nix - ../../config/users.nix - ../../config/dev.nix - ../../config/lsp.nix - ../../config/network.nix - ../../config/system.nix - ../../config/k3s.nix + ../../moduler/openssh.nix + ../../moduler/users.nix + ../../moduler/dev.nix + ../../moduler/lsp.nix + ../../moduler/network.nix + ../../moduler/system.nix + ../../moduler/k3s.nix ]; nixpkgs = { overlays = [ diff --git a/shared/aerc.nix b/moduler/aerc.nix similarity index 100% rename from shared/aerc.nix rename to moduler/aerc.nix diff --git a/config/base.nix b/moduler/base.nix similarity index 100% rename from config/base.nix rename to moduler/base.nix diff --git a/config/btusb-add-mt7925.patch b/moduler/btusb-add-mt7925.patch similarity index 100% rename from config/btusb-add-mt7925.patch rename to moduler/btusb-add-mt7925.patch diff --git a/config/btusb.nix b/moduler/btusb.nix similarity index 100% rename from config/btusb.nix rename to moduler/btusb.nix diff --git a/config/dev.nix b/moduler/dev.nix similarity index 100% rename from config/dev.nix rename to moduler/dev.nix diff --git a/shared/dmenu.nix b/moduler/dmenu.nix similarity index 84% rename from shared/dmenu.nix rename to moduler/dmenu.nix index c1e49bf..8d7783d 100644 --- a/shared/dmenu.nix +++ b/moduler/dmenu.nix @@ -7,7 +7,7 @@ let # imlib2 # xorg.libXinerama # ]; - patches = [ ../config/dmenu-center.diff ]; + patches = [ ../moduler/dmenu-center.diff ]; }); in { diff --git a/shared/dunst.nix b/moduler/dunst.nix similarity index 100% rename from shared/dunst.nix rename to moduler/dunst.nix diff --git a/shared/dwm.nix b/moduler/dwm.nix similarity index 100% rename from shared/dwm.nix rename to moduler/dwm.nix diff --git a/shared/firefox.nix b/moduler/firefox.nix similarity index 100% rename from shared/firefox.nix rename to moduler/firefox.nix diff --git a/shared/fish.nix b/moduler/fish.nix similarity index 100% rename from shared/fish.nix rename to moduler/fish.nix diff --git a/shared/git.nix b/moduler/git.nix similarity index 100% rename from shared/git.nix rename to moduler/git.nix diff --git a/shared/gtk.nix b/moduler/gtk.nix similarity index 100% rename from shared/gtk.nix rename to moduler/gtk.nix diff --git a/config/headless-home.nix b/moduler/headless-home.nix similarity index 100% rename from config/headless-home.nix rename to moduler/headless-home.nix diff --git a/config/home.nix b/moduler/home.nix similarity index 100% rename from config/home.nix rename to moduler/home.nix diff --git a/config/hyprland.nix b/moduler/hyprland.nix similarity index 98% rename from config/hyprland.nix rename to moduler/hyprland.nix index 87a54c5..c5c789e 100644 --- a/config/hyprland.nix +++ b/moduler/hyprland.nix @@ -80,7 +80,7 @@ in }; decoration = { - rounding = 15; + rounding = 0; active_opacity = 0.9; inactive_opacity = 0.8; fullscreen_opacity = 0.9; @@ -102,7 +102,7 @@ in }; animations = { - enabled = true; + enabled = false; bezier = [ "linear, 0, 0, 1, 1" "md3_standard, 0.2, 0, 0, 1" @@ -201,7 +201,7 @@ in # Applications "$mod, q, exec, ${pkgs.firefox}/bin/firefox" - "$mod, d, exec, ${pkgs.wmenu}/bin/wmenu-run" + "$mod, d, exec, ${pkgs.rofi}/bin/rofi" # Screencapture diff --git a/config/k3s.nix b/moduler/k3s.nix similarity index 100% rename from config/k3s.nix rename to moduler/k3s.nix diff --git a/shared/k9s.nix b/moduler/k9s.nix similarity index 100% rename from shared/k9s.nix rename to moduler/k9s.nix diff --git a/shared/kitty.nix b/moduler/kitty.nix similarity index 100% rename from shared/kitty.nix rename to moduler/kitty.nix diff --git a/shared/lazygit.nix b/moduler/lazygit.nix similarity index 55% rename from shared/lazygit.nix rename to moduler/lazygit.nix index 1230b45..8dae9e2 100644 --- a/shared/lazygit.nix +++ b/moduler/lazygit.nix @@ -5,23 +5,6 @@ enable = true; settings = { gui = { - # Mocha - # theme = { - # activeBorderColor = [ "#f5a97f" "bold" ]; - # inactiveBorderColor = [ "#a5adcb" ]; - # optionsTextColor = [ "#8aadf4" ]; - # selectedLineBgColor = [ "#363a4f" ]; - # cherryPickedCommitBgColor = [ "#494d64" ]; - # cherryPickedCommitFgColor = [ "#f5a97f" ]; - # unstagedChangesColor = [ "#ed8796" ]; - # defaultFgColor = [ "#cad3f5" ]; - # searchingActiveBorderColor = [ "#eed49f" ]; - # }; - # - # authorColors = { - # "*" = "#b7bdf8"; - # }; - # Latte theme = { activeBorderColor = [ "#fe640b" "bold" ]; inactiveBorderColor = [ "#6c6f85" ]; diff --git a/config/lsp.nix b/moduler/lsp.nix similarity index 100% rename from config/lsp.nix rename to moduler/lsp.nix diff --git a/shared/neovim.nix b/moduler/neovim.nix similarity index 100% rename from shared/neovim.nix rename to moduler/neovim.nix diff --git a/config/network.nix b/moduler/network.nix similarity index 100% rename from config/network.nix rename to moduler/network.nix diff --git a/shared/nginx.nix b/moduler/nginx.nix similarity index 100% rename from shared/nginx.nix rename to moduler/nginx.nix diff --git a/shared/nixpkgs.nix b/moduler/nixpkgs.nix similarity index 100% rename from shared/nixpkgs.nix rename to moduler/nixpkgs.nix diff --git a/shared/oh-my-posh.nix b/moduler/oh-my-posh.nix similarity index 100% rename from shared/oh-my-posh.nix rename to moduler/oh-my-posh.nix diff --git a/shared/openssh.nix b/moduler/openssh.nix similarity index 100% rename from shared/openssh.nix rename to moduler/openssh.nix diff --git a/config/programs-minimal.nix b/moduler/programs-minimal.nix similarity index 100% rename from config/programs-minimal.nix rename to moduler/programs-minimal.nix diff --git a/config/programs.nix b/moduler/programs.nix similarity index 100% rename from config/programs.nix rename to moduler/programs.nix diff --git a/shared/ssh.nix b/moduler/ssh.nix similarity index 100% rename from shared/ssh.nix rename to moduler/ssh.nix diff --git a/shared/st.nix b/moduler/st.nix similarity index 100% rename from shared/st.nix rename to moduler/st.nix diff --git a/config/sway.nix b/moduler/sway.nix similarity index 100% rename from config/sway.nix rename to moduler/sway.nix diff --git a/config/system.nix b/moduler/system.nix similarity index 100% rename from config/system.nix rename to moduler/system.nix diff --git a/shared/tmux.nix b/moduler/tmux.nix similarity index 90% rename from shared/tmux.nix rename to moduler/tmux.nix index f815da0..199e85e 100644 --- a/shared/tmux.nix +++ b/moduler/tmux.nix @@ -12,12 +12,12 @@ tmuxPlugins.sensible tmuxPlugins.pain-control tmuxPlugins.sessionist - # { - # plugin = pkgs.fw-pkgs.tmuxPlugins.minimal; - # extraConfig = '' - # bind-key b set-option status - # ''; - # } + { + plugin = fw-pkgs.tmuxPlugins.minimal; + extraConfig = '' + bind-key b set-option status + ''; + } ]; extraConfig = '' diff --git a/config/users.nix b/moduler/users.nix similarity index 100% rename from config/users.nix rename to moduler/users.nix diff --git a/shared/zathura.nix b/moduler/zathura.nix similarity index 100% rename from shared/zathura.nix rename to moduler/zathura.nix