From 084bdfb7ac1d2b8d65a7b328f18123bbd8743e7d Mon Sep 17 00:00:00 2001 From: xeovalyte Date: Thu, 20 Jun 2024 13:00:14 +0200 Subject: [PATCH 1/2] Laptop configuration --- modules/home/programs/common.nix | 1 + modules/home/programs/shell.nix | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/home/programs/common.nix b/modules/home/programs/common.nix index 0dba79a..3ca5225 100644 --- a/modules/home/programs/common.nix +++ b/modules/home/programs/common.nix @@ -21,6 +21,7 @@ unstable.cubiomes-viewer unstable.yt-dlp unstable.rnote + unstable.vesktop # Image editing gimp diff --git a/modules/home/programs/shell.nix b/modules/home/programs/shell.nix index 0d40fab..de68721 100644 --- a/modules/home/programs/shell.nix +++ b/modules/home/programs/shell.nix @@ -14,11 +14,16 @@ enable = true; }; - programs.zellij = { + programs.starship = { enable = true; enableBashIntegration = true; }; + programs.zellij = { + enable = true; + # enableBashIntegration = true; + }; + home.file.zellij = { target = ".config/zellij/config.kdl"; text = '' From b76932ead355b03c67260c6363c573d507357dbf Mon Sep 17 00:00:00 2001 From: xeovalyte Date: Thu, 20 Jun 2024 13:41:57 +0200 Subject: [PATCH 2/2] Refactor directory structure --- hosts/desktop/default.nix | 29 ++++++++------- hosts/desktop/home.nix | 31 +++------------- hosts/laptop/default.nix | 34 ++++++++++-------- hosts/laptop/home.nix | 35 +++++++++++-------- modules/home/cli/common/default.nix | 9 +++++ modules/home/{programs => cli/common}/git.nix | 0 .../home/{programs => cli/common}/helix.nix | 0 .../home/{programs => cli/common}/shell.nix | 0 .../home/{programs => cli}/neovim/autocmd.lua | 0 .../{programs => cli}/neovim/colorscheme.lua | 0 .../home/{programs => cli}/neovim/default.nix | 0 .../home/{programs => cli}/neovim/keymaps.lua | 0 .../home/{programs => cli}/neovim/options.lua | 0 .../neovim/plugins/bufferline.lua | 0 .../{programs => cli}/neovim/plugins/cmp.lua | 0 .../neovim/plugins/harpoon.lua | 0 .../{programs => cli}/neovim/plugins/lsp.lua | 0 .../neovim/plugins/lualine.lua | 0 .../neovim/plugins/markdown-preview.lua | 0 .../neovim/plugins/nvim-tree.lua | 0 .../neovim/plugins/toggleterm.lua | 0 .../neovim/plugins/treesitter.lua | 0 modules/home/{programs => cli}/ssh.nix | 0 .../{programs => gui/common}/alacritty.nix | 0 modules/home/gui/common/default.nix | 15 ++++++++ .../home/{programs => gui/common}/firefox.nix | 0 modules/home/{utils => gui/common}/fonts.nix | 0 .../{desktop => gui}/hyprland/default.nix | 0 .../home/{desktop => gui}/hyprland/dunst.nix | 0 .../home/{desktop => gui}/hyprland/fixes.nix | 0 .../{desktop => gui}/hyprland/hyprpaper.nix | 0 .../home/{desktop => gui}/hyprland/rofi.nix | 0 .../home/{desktop => gui}/hyprland/waybar.nix | 0 modules/home/{programs => gui}/modrinth.nix | 0 modules/home/{programs => gui}/nextcloud.nix | 0 .../{theme/default.nix => gui/theming.nix} | 6 ++++ modules/home/programs/common.nix | 33 ----------------- modules/home/programs/develop.nix | 7 ---- modules/home/programs/kitty.nix | 13 ------- modules/home/programs/librewolf.nix | 13 ------- modules/home/theme/README.md | 2 -- modules/home/theme/blueish.nix | 9 ----- modules/system/{utils => cli}/common.nix | 2 +- modules/system/{utils => cli}/docker.nix | 0 modules/system/desktop/keyring.nix | 9 ----- modules/system/{desktop => gui}/hyprland.nix | 7 ++-- .../system/{desktop => gui}/noisetorch.nix | 0 modules/system/{desktop => gui}/plasma.nix | 0 modules/system/{programs => gui}/steam.nix | 0 modules/system/{programs => gui}/sunshine.nix | 0 modules/system/{programs => gui}/thunar.nix | 0 modules/system/{desktop => hardware}/amd.nix | 0 .../{desktop => hardware}/bluetooth.nix | 0 .../system/{utils => hardware}/firewall.nix | 0 modules/system/{utils => hardware}/fprint.nix | 0 .../garbage-collection.nix | 0 modules/system/{utils => hardware}/laptop.nix | 0 modules/system/{utils => hardware}/locale.nix | 0 .../system/{desktop => hardware}/nvidia.nix | 0 .../system/{utils => hardware}/printing.nix | 0 modules/system/programs/syncthing.nix | 30 ---------------- modules/system/programs/virtualization.nix | 13 ------- 62 files changed, 92 insertions(+), 205 deletions(-) create mode 100644 modules/home/cli/common/default.nix rename modules/home/{programs => cli/common}/git.nix (100%) rename modules/home/{programs => cli/common}/helix.nix (100%) rename modules/home/{programs => cli/common}/shell.nix (100%) rename modules/home/{programs => cli}/neovim/autocmd.lua (100%) rename modules/home/{programs => cli}/neovim/colorscheme.lua (100%) rename modules/home/{programs => cli}/neovim/default.nix (100%) rename modules/home/{programs => cli}/neovim/keymaps.lua (100%) rename modules/home/{programs => cli}/neovim/options.lua (100%) rename modules/home/{programs => cli}/neovim/plugins/bufferline.lua (100%) rename modules/home/{programs => cli}/neovim/plugins/cmp.lua (100%) rename modules/home/{programs => cli}/neovim/plugins/harpoon.lua (100%) rename modules/home/{programs => cli}/neovim/plugins/lsp.lua (100%) rename modules/home/{programs => cli}/neovim/plugins/lualine.lua (100%) rename modules/home/{programs => cli}/neovim/plugins/markdown-preview.lua (100%) rename modules/home/{programs => cli}/neovim/plugins/nvim-tree.lua (100%) rename modules/home/{programs => cli}/neovim/plugins/toggleterm.lua (100%) rename modules/home/{programs => cli}/neovim/plugins/treesitter.lua (100%) rename modules/home/{programs => cli}/ssh.nix (100%) rename modules/home/{programs => gui/common}/alacritty.nix (100%) create mode 100644 modules/home/gui/common/default.nix rename modules/home/{programs => gui/common}/firefox.nix (100%) rename modules/home/{utils => gui/common}/fonts.nix (100%) rename modules/home/{desktop => gui}/hyprland/default.nix (100%) rename modules/home/{desktop => gui}/hyprland/dunst.nix (100%) rename modules/home/{desktop => gui}/hyprland/fixes.nix (100%) rename modules/home/{desktop => gui}/hyprland/hyprpaper.nix (100%) rename modules/home/{desktop => gui}/hyprland/rofi.nix (100%) rename modules/home/{desktop => gui}/hyprland/waybar.nix (100%) rename modules/home/{programs => gui}/modrinth.nix (100%) rename modules/home/{programs => gui}/nextcloud.nix (100%) rename modules/home/{theme/default.nix => gui/theming.nix} (85%) delete mode 100644 modules/home/programs/common.nix delete mode 100644 modules/home/programs/develop.nix delete mode 100644 modules/home/programs/kitty.nix delete mode 100644 modules/home/programs/librewolf.nix delete mode 100644 modules/home/theme/README.md delete mode 100644 modules/home/theme/blueish.nix rename modules/system/{utils => cli}/common.nix (88%) rename modules/system/{utils => cli}/docker.nix (100%) delete mode 100644 modules/system/desktop/keyring.nix rename modules/system/{desktop => gui}/hyprland.nix (84%) rename modules/system/{desktop => gui}/noisetorch.nix (100%) rename modules/system/{desktop => gui}/plasma.nix (100%) rename modules/system/{programs => gui}/steam.nix (100%) rename modules/system/{programs => gui}/sunshine.nix (100%) rename modules/system/{programs => gui}/thunar.nix (100%) rename modules/system/{desktop => hardware}/amd.nix (100%) rename modules/system/{desktop => hardware}/bluetooth.nix (100%) rename modules/system/{utils => hardware}/firewall.nix (100%) rename modules/system/{utils => hardware}/fprint.nix (100%) rename modules/system/{utils => hardware}/garbage-collection.nix (100%) rename modules/system/{utils => hardware}/laptop.nix (100%) rename modules/system/{utils => hardware}/locale.nix (100%) rename modules/system/{desktop => hardware}/nvidia.nix (100%) rename modules/system/{utils => hardware}/printing.nix (100%) delete mode 100644 modules/system/programs/syncthing.nix delete mode 100644 modules/system/programs/virtualization.nix diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index aaf6453..d302e7c 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -3,21 +3,20 @@ { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix -# ../../modules/system/desktop/hyprland.nix - ../../modules/system/desktop/plasma.nix -# ../../modules/system/desktop/noisetorch.nix - ../../modules/system/desktop/nvidia.nix -# ../../modules/system/programs/syncthing.nix -# ../../modules/system/programs/thunar.nix -# ../../modules/system/programs/steam.nix -# ../../modules/system/utils/common.nix -# ../../modules/system/utils/docker.nix -# ../../modules/system/utils/firewall.nix - #../../modules/system/utils/fprint.nix - ../../modules/system/utils/garbage-collection.nix - ../../modules/system/utils/locale.nix -# ../../modules/system/utils/printing.nix - ../../modules/system/programs/sunshine.nix + + # GUI + ../../modules/system/gui/plasma.nix + ../../modules/system/gui/steam.nix + ../../modules/system/gui/sunshine.nix + + # CLI + ../../modules/system/cli/common.nix + + # Hardware + ../../modules/system/hardware/firewall.nix + ../../modules/system/hardware/garbage-collection.nix + ../../modules/system/hardware/locale.nix + ../../modules/system/hardware/nvidia.nix ]; nix.settings = { diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index 41f950a..3898f0a 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -2,18 +2,11 @@ { imports = [ -# ../../modules/home/desktop/hyprland -# ../../modules/home/programs/barrier.nix -# ../../modules/home/programs/common.nix -# ../../modules/home/programs/develop.nix - ../../modules/home/programs/firefox.nix -# ../../modules/home/programs/modrinth.nix -# ../../modules/home/programs/neovim -# ../../modules/home/programs/git.nix -# ../../modules/home/programs/ssh.nix -# ../../modules/home/theme -# ../../modules/home/theme/blueish.nix -# ../../modules/home/utils/fonts.nix + # GUI + ../../modules/home/gui/common + + # CLI + ../../modules/home/cli/common ]; home = { @@ -22,22 +15,8 @@ }; home.packages = with pkgs; [ - # Desktop Applications - # kdenlive - # gthumb - unstable.bitwarden unstable.prismlauncher - # blender - -# unstable.surrealist ]; -# home.sessionVariables = { -# LIBVA_DRIVER_NAME = "nvidia"; -# XDG_SESSION_TYPE = "wayland"; -# __GLX_VENDOR_LIBRARY_NAME = "nvidia"; -# WLR_NO_HARDWARE_CURSORS = 1; -# }; - home.stateVersion = "24.05"; } diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix index c98d734..ab4b67c 100644 --- a/hosts/laptop/default.nix +++ b/hosts/laptop/default.nix @@ -1,20 +1,26 @@ { config, pkgs, ... }: { - imports = [ # Include the results of the hardware scan. + imports = [ ./hardware-configuration.nix - ../../modules/system/desktop/amd.nix - ../../modules/system/desktop/hyprland.nix - ../../modules/system/desktop/bluetooth.nix - ../../modules/system/programs/steam.nix - ../../modules/system/programs/syncthing.nix - ../../modules/system/programs/thunar.nix - ../../modules/system/utils/common.nix - ../../modules/system/utils/docker.nix -# ../../modules/system/utils/fprint.nix - ../../modules/system/utils/garbage-collection.nix - ../../modules/system/utils/locale.nix - ../../modules/system/utils/printing.nix + + # GUI + ../../modules/system/gui/hyprland.nix + ../../modules/system/gui/steam.nix + ../../modules/system/gui/thunar.nix + + # CLI + ../../modules/system/cli/common.nix + ../../modules/system/cli/docker.nix + + # Hardware + ../../modules/system/hardware/amd.nix + ../../modules/system/hardware/bluetooth.nix + ../../modules/system/hardware/firewall.nix + ../../modules/system/hardware/garbage-collection.nix + ../../modules/system/hardware/laptop.nix + ../../modules/system/hardware/locale.nix + ../../modules/system/hardware/printing.nix ]; nix.settings = { @@ -41,8 +47,6 @@ extraGroups = [ "networkmanager" "wheel" "dialout" ]; }; - services.printing.enable = true; - boot.kernelPackages = pkgs.linuxPackages_latest; system.stateVersion = "24.05"; diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 6ef6737..dd715b6 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -2,17 +2,15 @@ { imports = [ - ../../modules/home/desktop/hyprland -# ../../modules/home/programs/barrier.nix - ../../modules/home/programs/common.nix - ../../modules/home/programs/firefox.nix - ../../modules/home/programs/git.nix - ../../modules/home/programs/modrinth.nix - ../../modules/home/programs/neovim - ../../modules/home/programs/ssh.nix - ../../modules/home/theme - ../../modules/home/theme/blueish.nix - ../../modules/home/utils/fonts.nix + # GUI + ../../modules/home/gui/common + ../../modules/home/gui/hyprland + ../../modules/home/gui/nextcloud.nix + ../../modules/home/gui/theming.nix + + # CLI + ../../modules/home/cli/common + ../../modules/home/cli/ssh.nix ]; home = { @@ -23,14 +21,21 @@ home.packages = with pkgs; [ # Desktop Applications kdenlive - gthumb - unstable.arduino-ide unstable.prismlauncher unstable.joplin-desktop - unstable.moonlight-qt - unstable.prusa-slicer + signal-desktop + unstable.vesktop + + # Office + libreoffice + onlyoffice-bin + + # Image editing + gimp + inkscape + ]; home.stateVersion = "24.05"; diff --git a/modules/home/cli/common/default.nix b/modules/home/cli/common/default.nix new file mode 100644 index 0000000..eb3022d --- /dev/null +++ b/modules/home/cli/common/default.nix @@ -0,0 +1,9 @@ +{ ... }: + +{ + imports = [ + ./git.nix + ./shell.nix + ./helix.nix + ]; +} diff --git a/modules/home/programs/git.nix b/modules/home/cli/common/git.nix similarity index 100% rename from modules/home/programs/git.nix rename to modules/home/cli/common/git.nix diff --git a/modules/home/programs/helix.nix b/modules/home/cli/common/helix.nix similarity index 100% rename from modules/home/programs/helix.nix rename to modules/home/cli/common/helix.nix diff --git a/modules/home/programs/shell.nix b/modules/home/cli/common/shell.nix similarity index 100% rename from modules/home/programs/shell.nix rename to modules/home/cli/common/shell.nix diff --git a/modules/home/programs/neovim/autocmd.lua b/modules/home/cli/neovim/autocmd.lua similarity index 100% rename from modules/home/programs/neovim/autocmd.lua rename to modules/home/cli/neovim/autocmd.lua diff --git a/modules/home/programs/neovim/colorscheme.lua b/modules/home/cli/neovim/colorscheme.lua similarity index 100% rename from modules/home/programs/neovim/colorscheme.lua rename to modules/home/cli/neovim/colorscheme.lua diff --git a/modules/home/programs/neovim/default.nix b/modules/home/cli/neovim/default.nix similarity index 100% rename from modules/home/programs/neovim/default.nix rename to modules/home/cli/neovim/default.nix diff --git a/modules/home/programs/neovim/keymaps.lua b/modules/home/cli/neovim/keymaps.lua similarity index 100% rename from modules/home/programs/neovim/keymaps.lua rename to modules/home/cli/neovim/keymaps.lua diff --git a/modules/home/programs/neovim/options.lua b/modules/home/cli/neovim/options.lua similarity index 100% rename from modules/home/programs/neovim/options.lua rename to modules/home/cli/neovim/options.lua diff --git a/modules/home/programs/neovim/plugins/bufferline.lua b/modules/home/cli/neovim/plugins/bufferline.lua similarity index 100% rename from modules/home/programs/neovim/plugins/bufferline.lua rename to modules/home/cli/neovim/plugins/bufferline.lua diff --git a/modules/home/programs/neovim/plugins/cmp.lua b/modules/home/cli/neovim/plugins/cmp.lua similarity index 100% rename from modules/home/programs/neovim/plugins/cmp.lua rename to modules/home/cli/neovim/plugins/cmp.lua diff --git a/modules/home/programs/neovim/plugins/harpoon.lua b/modules/home/cli/neovim/plugins/harpoon.lua similarity index 100% rename from modules/home/programs/neovim/plugins/harpoon.lua rename to modules/home/cli/neovim/plugins/harpoon.lua diff --git a/modules/home/programs/neovim/plugins/lsp.lua b/modules/home/cli/neovim/plugins/lsp.lua similarity index 100% rename from modules/home/programs/neovim/plugins/lsp.lua rename to modules/home/cli/neovim/plugins/lsp.lua diff --git a/modules/home/programs/neovim/plugins/lualine.lua b/modules/home/cli/neovim/plugins/lualine.lua similarity index 100% rename from modules/home/programs/neovim/plugins/lualine.lua rename to modules/home/cli/neovim/plugins/lualine.lua diff --git a/modules/home/programs/neovim/plugins/markdown-preview.lua b/modules/home/cli/neovim/plugins/markdown-preview.lua similarity index 100% rename from modules/home/programs/neovim/plugins/markdown-preview.lua rename to modules/home/cli/neovim/plugins/markdown-preview.lua diff --git a/modules/home/programs/neovim/plugins/nvim-tree.lua b/modules/home/cli/neovim/plugins/nvim-tree.lua similarity index 100% rename from modules/home/programs/neovim/plugins/nvim-tree.lua rename to modules/home/cli/neovim/plugins/nvim-tree.lua diff --git a/modules/home/programs/neovim/plugins/toggleterm.lua b/modules/home/cli/neovim/plugins/toggleterm.lua similarity index 100% rename from modules/home/programs/neovim/plugins/toggleterm.lua rename to modules/home/cli/neovim/plugins/toggleterm.lua diff --git a/modules/home/programs/neovim/plugins/treesitter.lua b/modules/home/cli/neovim/plugins/treesitter.lua similarity index 100% rename from modules/home/programs/neovim/plugins/treesitter.lua rename to modules/home/cli/neovim/plugins/treesitter.lua diff --git a/modules/home/programs/ssh.nix b/modules/home/cli/ssh.nix similarity index 100% rename from modules/home/programs/ssh.nix rename to modules/home/cli/ssh.nix diff --git a/modules/home/programs/alacritty.nix b/modules/home/gui/common/alacritty.nix similarity index 100% rename from modules/home/programs/alacritty.nix rename to modules/home/gui/common/alacritty.nix diff --git a/modules/home/gui/common/default.nix b/modules/home/gui/common/default.nix new file mode 100644 index 0000000..05d2bb8 --- /dev/null +++ b/modules/home/gui/common/default.nix @@ -0,0 +1,15 @@ +{ pkgs, ...}: + +{ + imports = [ + ./alacritty.nix + ./firefox.nix + ./fonts.nix + ]; + + home.packages = with pkgs; [ + vlc + bitwarden + pavucontrol + ]; +} diff --git a/modules/home/programs/firefox.nix b/modules/home/gui/common/firefox.nix similarity index 100% rename from modules/home/programs/firefox.nix rename to modules/home/gui/common/firefox.nix diff --git a/modules/home/utils/fonts.nix b/modules/home/gui/common/fonts.nix similarity index 100% rename from modules/home/utils/fonts.nix rename to modules/home/gui/common/fonts.nix diff --git a/modules/home/desktop/hyprland/default.nix b/modules/home/gui/hyprland/default.nix similarity index 100% rename from modules/home/desktop/hyprland/default.nix rename to modules/home/gui/hyprland/default.nix diff --git a/modules/home/desktop/hyprland/dunst.nix b/modules/home/gui/hyprland/dunst.nix similarity index 100% rename from modules/home/desktop/hyprland/dunst.nix rename to modules/home/gui/hyprland/dunst.nix diff --git a/modules/home/desktop/hyprland/fixes.nix b/modules/home/gui/hyprland/fixes.nix similarity index 100% rename from modules/home/desktop/hyprland/fixes.nix rename to modules/home/gui/hyprland/fixes.nix diff --git a/modules/home/desktop/hyprland/hyprpaper.nix b/modules/home/gui/hyprland/hyprpaper.nix similarity index 100% rename from modules/home/desktop/hyprland/hyprpaper.nix rename to modules/home/gui/hyprland/hyprpaper.nix diff --git a/modules/home/desktop/hyprland/rofi.nix b/modules/home/gui/hyprland/rofi.nix similarity index 100% rename from modules/home/desktop/hyprland/rofi.nix rename to modules/home/gui/hyprland/rofi.nix diff --git a/modules/home/desktop/hyprland/waybar.nix b/modules/home/gui/hyprland/waybar.nix similarity index 100% rename from modules/home/desktop/hyprland/waybar.nix rename to modules/home/gui/hyprland/waybar.nix diff --git a/modules/home/programs/modrinth.nix b/modules/home/gui/modrinth.nix similarity index 100% rename from modules/home/programs/modrinth.nix rename to modules/home/gui/modrinth.nix diff --git a/modules/home/programs/nextcloud.nix b/modules/home/gui/nextcloud.nix similarity index 100% rename from modules/home/programs/nextcloud.nix rename to modules/home/gui/nextcloud.nix diff --git a/modules/home/theme/default.nix b/modules/home/gui/theming.nix similarity index 85% rename from modules/home/theme/default.nix rename to modules/home/gui/theming.nix index ec5098b..4ac394f 100644 --- a/modules/home/theme/default.nix +++ b/modules/home/gui/theming.nix @@ -5,6 +5,12 @@ let gtkThemeFromScheme; in { + imports = [ + nix-colors.homeManagerModules.default + ]; + + colorScheme = nix-colors.colorSchemes.da-one-sea; + gtk = { enable = true; theme = { diff --git a/modules/home/programs/common.nix b/modules/home/programs/common.nix deleted file mode 100644 index 3ca5225..0000000 --- a/modules/home/programs/common.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ pkgs, ...}: - -{ - imports = [ - ./alacritty.nix - ./helix.nix - ./librewolf.nix - ./shell.nix - ./nextcloud.nix - ]; - - home.packages = with pkgs; [ - libreoffice - onlyoffice-bin - vlc - signal-desktop - unstable.webcord - unstable.localsend - bitwarden - pavucontrol - unstable.cubiomes-viewer - unstable.yt-dlp - unstable.rnote - unstable.vesktop - - # Image editing - gimp - inkscape - - # CLI tools - cloc - ]; -} diff --git a/modules/home/programs/develop.nix b/modules/home/programs/develop.nix deleted file mode 100644 index 5567472..0000000 --- a/modules/home/programs/develop.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, ... }: - -{ - home.packages = with pkgs; [ - unstable.dioxus-cli - ]; -} diff --git a/modules/home/programs/kitty.nix b/modules/home/programs/kitty.nix deleted file mode 100644 index f646560..0000000 --- a/modules/home/programs/kitty.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs, config, ... }: - -{ - programs.kitty = { - enable = true; - settings = { - foreground = "#${config.colorScheme.palette.base05}"; - background = "#${config.colorScheme.palette.base00}"; - background_opacity = "0.6"; - font_family = "DejaVuSansM Nerd Font Mono"; - }; - }; -} diff --git a/modules/home/programs/librewolf.nix b/modules/home/programs/librewolf.nix deleted file mode 100644 index 0fdcd7d..0000000 --- a/modules/home/programs/librewolf.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs, ... }: - -{ - programs.librewolf = { - enable = true; - package = pkgs.unstable.librewolf; - settings = { - "webgl.disabled" = false; - "privacy.resistFingerprinting" = false; - "privacy.clearOnShutdown.cookies" = false; - }; - }; -} diff --git a/modules/home/theme/README.md b/modules/home/theme/README.md deleted file mode 100644 index 0a0b843..0000000 --- a/modules/home/theme/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# Base16 themes -https://tinted-theming.github.io/base16-gallery/ diff --git a/modules/home/theme/blueish.nix b/modules/home/theme/blueish.nix deleted file mode 100644 index f6246e7..0000000 --- a/modules/home/theme/blueish.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ nix-colors, ... }: - -{ - imports = [ - nix-colors.homeManagerModules.default - ]; - - colorScheme = nix-colors.colorSchemes.da-one-sea; -} diff --git a/modules/system/utils/common.nix b/modules/system/cli/common.nix similarity index 88% rename from modules/system/utils/common.nix rename to modules/system/cli/common.nix index cf30949..c2af418 100644 --- a/modules/system/utils/common.nix +++ b/modules/system/cli/common.nix @@ -2,7 +2,7 @@ { environment.systemPackages = with pkgs; [ - usbutils + tree neofetch btop git diff --git a/modules/system/utils/docker.nix b/modules/system/cli/docker.nix similarity index 100% rename from modules/system/utils/docker.nix rename to modules/system/cli/docker.nix diff --git a/modules/system/desktop/keyring.nix b/modules/system/desktop/keyring.nix deleted file mode 100644 index 8384e31..0000000 --- a/modules/system/desktop/keyring.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: - -{ - services.gnome.gnome-keyring.enable = true; - - security.pam.services.greetd.enableGnomeKeyring = true; - - programs.ssh.startAgent = true; -} diff --git a/modules/system/desktop/hyprland.nix b/modules/system/gui/hyprland.nix similarity index 84% rename from modules/system/desktop/hyprland.nix rename to modules/system/gui/hyprland.nix index 9fa0340..22b059f 100644 --- a/modules/system/desktop/hyprland.nix +++ b/modules/system/gui/hyprland.nix @@ -1,10 +1,6 @@ { config, pkgs, ... }: { - imports = [ - ./keyring.nix - ]; - programs.hyprland = { enable = true; package = pkgs.unstable.hyprland; @@ -33,6 +29,9 @@ }; security.polkit.enable = true; + services.gnome.gnome-keyring.enable = true; + security.pam.services.greetd.enableGnomeKeyring = true; + programs.ssh.startAgent = true; # Configure networking networking.networkmanager.enable = true; diff --git a/modules/system/desktop/noisetorch.nix b/modules/system/gui/noisetorch.nix similarity index 100% rename from modules/system/desktop/noisetorch.nix rename to modules/system/gui/noisetorch.nix diff --git a/modules/system/desktop/plasma.nix b/modules/system/gui/plasma.nix similarity index 100% rename from modules/system/desktop/plasma.nix rename to modules/system/gui/plasma.nix diff --git a/modules/system/programs/steam.nix b/modules/system/gui/steam.nix similarity index 100% rename from modules/system/programs/steam.nix rename to modules/system/gui/steam.nix diff --git a/modules/system/programs/sunshine.nix b/modules/system/gui/sunshine.nix similarity index 100% rename from modules/system/programs/sunshine.nix rename to modules/system/gui/sunshine.nix diff --git a/modules/system/programs/thunar.nix b/modules/system/gui/thunar.nix similarity index 100% rename from modules/system/programs/thunar.nix rename to modules/system/gui/thunar.nix diff --git a/modules/system/desktop/amd.nix b/modules/system/hardware/amd.nix similarity index 100% rename from modules/system/desktop/amd.nix rename to modules/system/hardware/amd.nix diff --git a/modules/system/desktop/bluetooth.nix b/modules/system/hardware/bluetooth.nix similarity index 100% rename from modules/system/desktop/bluetooth.nix rename to modules/system/hardware/bluetooth.nix diff --git a/modules/system/utils/firewall.nix b/modules/system/hardware/firewall.nix similarity index 100% rename from modules/system/utils/firewall.nix rename to modules/system/hardware/firewall.nix diff --git a/modules/system/utils/fprint.nix b/modules/system/hardware/fprint.nix similarity index 100% rename from modules/system/utils/fprint.nix rename to modules/system/hardware/fprint.nix diff --git a/modules/system/utils/garbage-collection.nix b/modules/system/hardware/garbage-collection.nix similarity index 100% rename from modules/system/utils/garbage-collection.nix rename to modules/system/hardware/garbage-collection.nix diff --git a/modules/system/utils/laptop.nix b/modules/system/hardware/laptop.nix similarity index 100% rename from modules/system/utils/laptop.nix rename to modules/system/hardware/laptop.nix diff --git a/modules/system/utils/locale.nix b/modules/system/hardware/locale.nix similarity index 100% rename from modules/system/utils/locale.nix rename to modules/system/hardware/locale.nix diff --git a/modules/system/desktop/nvidia.nix b/modules/system/hardware/nvidia.nix similarity index 100% rename from modules/system/desktop/nvidia.nix rename to modules/system/hardware/nvidia.nix diff --git a/modules/system/utils/printing.nix b/modules/system/hardware/printing.nix similarity index 100% rename from modules/system/utils/printing.nix rename to modules/system/hardware/printing.nix diff --git a/modules/system/programs/syncthing.nix b/modules/system/programs/syncthing.nix deleted file mode 100644 index a095567..0000000 --- a/modules/system/programs/syncthing.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ ... }: - -{ - services.syncthing = { - enable = true; - user = "xeovalyte"; - dataDir = "/home/xeovalyte"; - overrideDevices = true; - overrideFolders = true; - openDefaultPorts = true; - settings = { - devices = { - "xv-server" = { - id = "DYBGKGM-I7JM6NG-EV7EGYY-NZL5WCG-CSDSJCJ-B4Q7AOP-5YVQYAZ-ETLQWA5"; - addresses = [ - "dynamic" - "tcp://ddns.xeovalyte.com:22000" - "quick://ddns.xeovalyte.com:22000" - ]; - }; - }; - folders = { - "xeovalyte-documents" = { - path = "/home/xeovalyte/Documents"; - devices = [ "xv-server" ]; - }; - }; - }; - }; -} diff --git a/modules/system/programs/virtualization.nix b/modules/system/programs/virtualization.nix deleted file mode 100644 index 72c0669..0000000 --- a/modules/system/programs/virtualization.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs, ... }: - -{ - virtualisation.libvirtd.enable = true; - programs.virt-manager.enable = true; - - users.users.xeovalyte.extraGroups = [ "libvirtd" ]; - - environment.systemPackages = with pkgs; [ - quickemu - quickgui - ]; -}