diff options
Diffstat (limited to 'hm')
37 files changed, 219 insertions, 104 deletions
diff --git a/hm/conf/clip.nix b/hm/conf/clip.nix index 82de671..4db661b 100644 --- a/hm/conf/clip.nix +++ b/hm/conf/clip.nix @@ -1,9 +1,9 @@ { config, lib, pkgs, ... }: let - cfg = config.szpont.hm.conf.clipboard; + cfg = config.hm.conf.clip; in { - options.szpont.hm.conf.clipboard = { + options.hm.conf.clip = { enable = lib.mkEnableOption "cliphist clipboard history"; backend = lib.mkOption { @@ -12,7 +12,6 @@ in description = "which clipboard backend tools to install"; }; }; - config = lib.mkIf cfg.enable { services.cliphist = { enable = true; diff --git a/hm/conf/conf.nix b/hm/conf/conf.nix index c05c5c3..6c54d8a 100644 --- a/hm/conf/conf.nix +++ b/hm/conf/conf.nix @@ -3,7 +3,6 @@ imports = [ ./clip.nix ./git.nix - ./ssh.nix ./xdg-dirs.nix ]; } diff --git a/hm/conf/git.nix b/hm/conf/git.nix index f6a7267..8797a52 100644 --- a/hm/conf/git.nix +++ b/hm/conf/git.nix @@ -1,10 +1,9 @@ { config, lib, ... }: let - cfg = config.szpont.hm.conf.git; + cfg = config.hm.conf.git; in { - options.szpont.hm.conf.git.enable = lib.mkEnableOption "enables git vcs"; - + options.hm.conf.git.enable = lib.mkEnableOption "enables git vcs"; config = lib.mkIf cfg.enable { programs.git = { enable = true; diff --git a/hm/conf/ssh.nix b/hm/conf/ssh.nix deleted file mode 100644 index 4587751..0000000 --- a/hm/conf/ssh.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, lib, ... }: -let - cfg = config.szpont.hm.conf.ssh; -in -{ - options.szpont.hm.conf.ssh.enable = lib.mkEnableOption "enables ssh support"; - - config = lib.mkIf cfg.enable { - - }; -} diff --git a/hm/conf/xdg-dirs.nix b/hm/conf/xdg-dirs.nix index 2bd9e64..c6cf03b 100644 --- a/hm/conf/xdg-dirs.nix +++ b/hm/conf/xdg-dirs.nix @@ -1,9 +1,9 @@ { config, lib, ... }: let - cfg = config.szpont.hm.conf.xdg-dirs; + cfg = config.hm.conf.xdg-dirs; in { - options.szpont.hm.conf.xdg-dirs = { + options.hm.conf.xdg-dirs = { enable = lib.mkEnableOption "enables xdg dirs"; mediaPath = lib.mkOption { @@ -12,7 +12,6 @@ in description = "base path for media"; }; }; - config = lib.mkIf cfg.enable { xdg.userDirs = { enable = true; @@ -46,6 +45,5 @@ in XDG_CLIPS_DIR = "${toString cfg.mediaPath}/vids/clips"; XDG_ARCHIVE_DIR = "${toString cfg.mediaPath}/archive"; }; - }; } diff --git a/hm/editors/helix.nix b/hm/editors/helix.nix index 05412a8..d20db0e 100644 --- a/hm/editors/helix.nix +++ b/hm/editors/helix.nix @@ -1,10 +1,9 @@ { config, lib, pkgs, ... }: let - cfg = config.szpont.hm.editors.helix; + cfg = config.hm.editors.helix; in { - options.szpont.hm.editors.helix.enable = lib.mkEnableOption "enables helix editor"; - + options.hm.editors.helix.enable = lib.mkEnableOption "enables helix editor"; config = lib.mkIf cfg.enable { programs.helix = { enable = true; diff --git a/hm/editors/nixvim.nix b/hm/editors/nixvim.nix index a80a674..b4d24a7 100644 --- a/hm/editors/nixvim.nix +++ b/hm/editors/nixvim.nix @@ -1,14 +1,12 @@ { inputs, config, lib, pkgs, ... }: let - cfg = config.szpont.hm.editors.nixvim; + cfg = config.hm.editors.nixvim; in { imports = [ inputs.nixvim.homeModules.nixvim ]; - options.szpont.hm.editors.nixvim.enable = lib.mkEnableOption "enables nixvim config framework"; - + options.hm.editors.nixvim.enable = lib.mkEnableOption "enables nixvim config framework"; config = lib.mkIf cfg.enable { - programs.nixvim = { enable = true; package = inputs.neovim-nightly-overlay.packages.${pkgs.stdenv.hostPlatform.system}.default; diff --git a/hm/editors/nvf.nix b/hm/editors/nvf.nix index 91348a9..6da28fe 100644 --- a/hm/editors/nvf.nix +++ b/hm/editors/nvf.nix @@ -1,10 +1,9 @@ { inputs, config, lib, pkgs, ... }: let - cfg = config.szpont.hm.editors.nvf; + cfg = config.hm.editors.nvf; in { - options.szpont.hm.editors.nvf.enable = lib.mkEnableOption "enables nvf configuration framework"; - + options.hm.editors.nvf.enable = lib.mkEnableOption "enables nvf configuration framework"; config = lib.mkIf cfg.enable { programs.nvf = { enable = true; diff --git a/hm/soft/awww.nix b/hm/env/awww.nix index e807c9d..d666742 100644 --- a/hm/soft/awww.nix +++ b/hm/env/awww.nix @@ -1,10 +1,9 @@ { config, lib, pkgs, inputs, ... }: let - cfg = config.szpont.hm.soft.awww; + cfg = config.hm.env.awww; in { - options.szpont.hm.soft.awww.enable = lib.mkEnableOption "enables awww"; - + options.hm.env.awww.enable = lib.mkEnableOption "enables awww"; config = lib.mkIf cfg.enable { services.swww = { enable = true; diff --git a/hm/env/env.nix b/hm/env/env.nix index 1c2c6d2..2f0fab1 100644 --- a/hm/env/env.nix +++ b/hm/env/env.nix @@ -3,6 +3,11 @@ imports = [ ./niri/niri.nix + ./awww.nix + ./fuzzel.nix + ./screenshot.nix + ./swayidle.nix + ./swaylock.nix ./theme.nix ./waybar.nix ]; diff --git a/hm/soft/fuzzel.nix b/hm/env/fuzzel.nix index 234aff7..8d4462f 100644 --- a/hm/soft/fuzzel.nix +++ b/hm/env/fuzzel.nix @@ -1,10 +1,9 @@ { config, lib, ... }: let - cfg = config.szpont.hm.soft.fuzzel; + cfg = config.hm.env.fuzzel; in { - options.szpont.hm.soft.fuzzel.enable = lib.mkEnableOption "enables fuzzel"; - + options.hm.env.fuzzel.enable = lib.mkEnableOption "enables fuzzel"; config = lib.mkIf cfg.enable { programs.fuzzel = { enable = true; diff --git a/hm/env/niri/niri.nix b/hm/env/niri/niri.nix index fddfcac..eb073e7 100644 --- a/hm/env/niri/niri.nix +++ b/hm/env/niri/niri.nix @@ -1,15 +1,14 @@ { config, lib, pkgs, ... }: let - cfg = config.szpont.hm.env.niri; + cfg = config.hm.env.niri; in { - options.szpont.hm.env.niri.enable = lib.mkEnableOption "niri hm"; + options.hm.env.niri.enable = lib.mkEnableOption "niri hm"; config = lib.mkIf cfg.enable { - - szpont.hm.soft = { + hm.env = { awww.enable = true; fuzzel.enable = true; - satty.enable = true; + screenshot.enable = true; swayidle.enable = true; swaylock.enable = true; }; @@ -87,8 +86,6 @@ in }; home.packages = with pkgs; [ qalculate-gtk - grim - slurp ]; }; } diff --git a/hm/env/screenshot.nix b/hm/env/screenshot.nix new file mode 100644 index 0000000..e61e3de --- /dev/null +++ b/hm/env/screenshot.nix @@ -0,0 +1,16 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.hm.env.screenshot; +in +{ + options.hm.env.screenshot.enable = lib.mkEnableOption "enables screenshot utilities"; + config = lib.mkIf cfg.enable { + programs.satty = { + enable = true; + }; + home.packages = with pkgs; [ + grim + slurp + ]; + }; +} diff --git a/hm/soft/swayidle.nix b/hm/env/swayidle.nix index d06c74a..41f64a2 100644 --- a/hm/soft/swayidle.nix +++ b/hm/env/swayidle.nix @@ -1,10 +1,9 @@ { config, lib, ... }: let - cfg = config.szpont.hm.soft.swayidle; + cfg = config.hm.env.swayidle; in { - options.szpont.hm.soft.swayidle.enable = lib.mkEnableOption "enables swayidle"; - + options.hm.env.swayidle.enable = lib.mkEnableOption "enables swayidle"; config = lib.mkIf cfg.enable { services.swayidle = { enable = true; diff --git a/hm/soft/swaylock.nix b/hm/env/swaylock.nix index a303e48..afde020 100644 --- a/hm/soft/swaylock.nix +++ b/hm/env/swaylock.nix @@ -1,10 +1,9 @@ { config, lib, pkgs, ... }: let - cfg = config.szpont.hm.soft.swaylock; + cfg = config.hm.env.swaylock; in { - options.szpont.hm.soft.swaylock.enable = lib.mkEnableOption "enables swaylock"; - + options.hm.env.swaylock.enable = lib.mkEnableOption "enables swaylock"; config = lib.mkIf cfg.enable { programs.swaylock = { enable = true; diff --git a/hm/env/theme.nix b/hm/env/theme.nix index 54dd00b..761e394 100644 --- a/hm/env/theme.nix +++ b/hm/env/theme.nix @@ -1,14 +1,13 @@ { config, lib, pkgs, ... }: let - cfg = config.szpont.hm.env.themes; + cfg = config.hm.env.themes; in { - options.szpont.hm.env.themes = { + options.hm.env.themes = { enable = lib.mkEnableOption "enables global theming"; gtk.enable = lib.mkEnableOption "GTK theming"; qt.enable = lib.mkEnableOption "QT theming"; }; - config = lib.mkIf cfg.enable (lib.mkMerge [ (lib.mkIf cfg.gtk.enable { gtk = { diff --git a/hm/env/waybar.nix b/hm/env/waybar.nix index 84ccea9..182a4fb 100644 --- a/hm/env/waybar.nix +++ b/hm/env/waybar.nix @@ -1,10 +1,9 @@ { config, lib, ... }: let - cfg = config.szpont.hm.env.waybar; + cfg = config.hm.env.waybar; in { - options.szpont.hm.env.waybar.enable = lib.mkEnableOption "enables waybar"; - + options.hm.env.waybar.enable = lib.mkEnableOption "enables waybar"; config = lib.mkIf cfg.enable { programs.waybar = { enable = true; diff --git a/hm/shell/cli.nix b/hm/shell/cli.nix index 222b002..60e78db 100644 --- a/hm/shell/cli.nix +++ b/hm/shell/cli.nix @@ -1,10 +1,9 @@ { config, lib, pkgs, ... }: let - cfg = config.szpont.hm.shell.cli; + cfg = config.hm.shell.cli; in { - options.szpont.hm.shell.cli.enable = lib.mkEnableOption "modern cli tools"; - + options.hm.shell.cli.enable = lib.mkEnableOption "modern cli tools"; config = lib.mkIf cfg.enable { programs.zoxide.enable = true; programs.zoxide.options = [ "--cmd cd" ]; @@ -24,7 +23,6 @@ in programs.fastfetch.enable = true; home.packages = with pkgs; [ - gdu file mediainfo chafa diff --git a/hm/shell/fish.nix b/hm/shell/fish.nix index 644eadc..b2e349a 100644 --- a/hm/shell/fish.nix +++ b/hm/shell/fish.nix @@ -1,10 +1,9 @@ { config, lib, pkgs, ... }: let - cfg = config.szpont.hm.shell.fish; + cfg = config.hm.shell.fish; in { - options.szpont.hm.shell.fish.enable = lib.mkEnableOption "enables fish shell"; - + options.hm.shell.fish.enable = lib.mkEnableOption "enables fish shell"; config = lib.mkIf cfg.enable { programs.fish = { enable = true; diff --git a/hm/shell/foot.nix b/hm/shell/foot.nix index 9847399..ecd345a 100644 --- a/hm/shell/foot.nix +++ b/hm/shell/foot.nix @@ -1,6 +1,6 @@ { pkgs, lib, config, ... }: let - cfg = config.szpont.hm.shell.foot; + cfg = config.hm.shell.foot; footTheme = pkgs.fetchurl { url = "https://codeberg.org/dnkl/foot/raw/branch/master/themes/gruvbox-dark"; @@ -8,7 +8,7 @@ let }; in { - options.szpont.hm.shell.foot = { + options.hm.shell.foot = { enable = lib.mkEnableOption "foot terminal emulator"; fontSize = lib.mkOption { type = lib.types.int; @@ -16,7 +16,6 @@ in description = "Font size for the foot terminal"; }; }; - config = lib.mkIf cfg.enable { programs.foot = { enable = true; diff --git a/hm/shell/starship.nix b/hm/shell/starship.nix index 4996bdc..657ff5c 100644 --- a/hm/shell/starship.nix +++ b/hm/shell/starship.nix @@ -1,10 +1,9 @@ { config, lib, ... }: let - cfg = config.szpont.hm.shell.starship; + cfg = config.hm.shell.starship; in { - options.szpont.hm.shell.starship.enable = lib.mkEnableOption "Starship prompt"; - + options.hm.shell.starship.enable = lib.mkEnableOption "Starship prompt"; config = lib.mkIf cfg.enable { programs.starship = { enable = true; diff --git a/hm/soft/browser.nix b/hm/soft/browser.nix new file mode 100644 index 0000000..023dce8 --- /dev/null +++ b/hm/soft/browser.nix @@ -0,0 +1,26 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.hm.soft.browser; +in +{ + options.hm.soft.browser = { + enable = lib.mkEnableOption "browser configs"; + + librewolf.enable = lib.mkEnableOption "LibreWolf browser"; + firefox.enable = lib.mkEnableOption "Firefox browser"; + brave.enable = lib.mkEnableOption "Brave browser"; + }; + config = lib.mkIf cfg.enable (lib.mkMerge [ + (lib.mkIf cfg.librewolf.enable { + programs.librewolf.enable = true; + }) + + (lib.mkIf cfg.firefox.enable { + programs.firefox.enable = true; + }) + + (lib.mkIf cfg.brave.enable { + home.packages = [ pkgs.brave ]; + }) + ]); +} diff --git a/hm/soft/easyeffects.nix b/hm/soft/easyeffects.nix index beb9ad6..ab16736 100644 --- a/hm/soft/easyeffects.nix +++ b/hm/soft/easyeffects.nix @@ -1,10 +1,9 @@ { config, lib, ... }: let - cfg = config.szpont.hm.soft.easyeffects; + cfg = config.hm.soft.easyeffects; in { - options.szpont.hm.soft.easyeffects.enable = lib.mkEnableOption "EasyEffects audio equalizer"; - + options.hm.soft.easyeffects.enable = lib.mkEnableOption "EasyEffects audio equalizer"; config = lib.mkIf cfg.enable { services.easyeffects = { enable = true; diff --git a/hm/soft/email.nix b/hm/soft/email.nix new file mode 100644 index 0000000..d7ec9ea --- /dev/null +++ b/hm/soft/email.nix @@ -0,0 +1,21 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.hm.soft.email; +in +{ + options.hm.soft.email = { + enable = lib.mkEnableOption "email configs"; + + thunderbird.enable = lib.mkEnableOption "thunderbird config"; + evolution.enable = lib.mkEnableOption "evolution config"; + }; + config = lib.mkIf cfg.enable (lib.mkMerge [ + (lib.mkIf cfg.thunderbird.enable { + programs.librewolf.enable = true; + }) + + (lib.mkIf cfg.evolution.enable { + home.packages = [ pkgs.evolution ]; + }) + ]); +} diff --git a/hm/soft/kdeconnect.nix b/hm/soft/kdeconnect.nix new file mode 100644 index 0000000..07a5d9e --- /dev/null +++ b/hm/soft/kdeconnect.nix @@ -0,0 +1,15 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.hm.soft.kdeconnect; +in +{ + options.hm.soft.kdeconnect.enable = lib.mkEnableOption "enables kde connect integration and dolphin"; + + config = lib.mkIf cfg.enable { + services.kdeconnect.enable = true; + + home.packages = [ + pkgs.kdePackages.dolphin + ]; + }; +} diff --git a/hm/soft/kdenlive.nix b/hm/soft/kdenlive.nix new file mode 100644 index 0000000..f2ca560 --- /dev/null +++ b/hm/soft/kdenlive.nix @@ -0,0 +1,10 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.hm.soft.kdenlive; +in +{ + options.hm.soft.kdenlive.enable = lib.mkEnableOption "enables kdenlive editing"; + config = lib.mkIf cfg.enable { + home.packages = [ pkgs.kdePackages.kdenlive ]; + }; +} diff --git a/hm/soft/gaming.nix b/hm/soft/mangohud.nix index 5fc7095..eae15d5 100644 --- a/hm/soft/gaming.nix +++ b/hm/soft/mangohud.nix @@ -1,9 +1,9 @@ { config, lib, ... }: let - cfg = config.szpont.hm.soft.gaming; + cfg = config.hm.soft.mangohud; in { - options.szpont.hm.soft.gaming.enable = lib.mkEnableOption "gaming hm config"; + options.hm.soft.mangohud.enable = lib.mkEnableOption "mangohud hm config"; config = lib.mkIf cfg.enable { programs.mangohud = { enable = true; diff --git a/hm/soft/media.nix b/hm/soft/media.nix index 0184957..abf3dff 100644 --- a/hm/soft/media.nix +++ b/hm/soft/media.nix @@ -1,10 +1,9 @@ { config, lib, pkgs, ... }: let - cfg = config.szpont.hm.soft.media; + cfg = config.hm.soft.media; in { - options.szpont.hm.soft.media.enable = lib.mkEnableOption "media playback and processing tools"; - + options.hm.soft.media.enable = lib.mkEnableOption "media playback and processing tools"; config = lib.mkIf cfg.enable { programs.mpv = { enable = true; @@ -18,7 +17,6 @@ in }; home.packages = with pkgs; [ - # syncplay syncplay-nogui ffmpeg imagemagick diff --git a/hm/soft/nixcord.nix b/hm/soft/nixcord.nix index 4da3466..b0e3396 100644 --- a/hm/soft/nixcord.nix +++ b/hm/soft/nixcord.nix @@ -1,12 +1,11 @@ { inputs, config, lib, pkgs, ... }: let - cfg = config.szpont.hm.soft.nixcord; + cfg = config.hm.soft.nixcord; in { imports = [ inputs.nixcord.homeModules.nixcord ]; - options.szpont.hm.soft.nixcord.enable = lib.mkEnableOption "nixcord configuration"; - + options.hm.soft.nixcord.enable = lib.mkEnableOption "nixcord configuration"; config = lib.mkIf cfg.enable { programs.nixcord = { enable = true; diff --git a/hm/soft/obs.nix b/hm/soft/obs.nix new file mode 100644 index 0000000..f0ae054 --- /dev/null +++ b/hm/soft/obs.nix @@ -0,0 +1,12 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.hm.soft.obs; +in +{ + options.hm.soft.obs.enable = lib.mkEnableOption "enables obs video recording and clipping"; + config = lib.mkIf cfg.enable { + programs.obs-studio = { + enable = true; + }; + }; +} diff --git a/hm/soft/obsidian.nix b/hm/soft/obsidian.nix new file mode 100644 index 0000000..a840726 --- /dev/null +++ b/hm/soft/obsidian.nix @@ -0,0 +1,12 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.hm.soft.obsidian; +in +{ + options.hm.soft.obsidian.enable = lib.mkEnableOption "enables obsidian notetaking"; + config = lib.mkIf cfg.enable { + programs.obsidian = { + enable = true; + }; + }; +} diff --git a/hm/soft/onlyoffice.nix b/hm/soft/onlyoffice.nix new file mode 100644 index 0000000..db7ad66 --- /dev/null +++ b/hm/soft/onlyoffice.nix @@ -0,0 +1,12 @@ +{ config, lib, ... }: +let + cfg = config.hm.soft.onlyoffice; +in +{ + options.hm.soft.onlyoffice.enable = lib.mkEnableOption "onlyoffice suite"; + config = lib.mkIf cfg.enable { + programs.onlyoffice = { + enable = true; + }; + }; +} diff --git a/hm/soft/satty.nix b/hm/soft/satty.nix deleted file mode 100644 index d3964a7..0000000 --- a/hm/soft/satty.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, lib, ... }: -let - cfg = config.szpont.hm.soft.satty; -in -{ - options.szpont.hm.soft.satty.enable = lib.mkEnableOption "enables satty image editor"; - - config = lib.mkIf cfg.enable { - programs.satty = { - enable = true; - }; - }; -} diff --git a/hm/soft/soft.nix b/hm/soft/soft.nix index eb975ea..191ada7 100644 --- a/hm/soft/soft.nix +++ b/hm/soft/soft.nix @@ -1,15 +1,19 @@ { ... }: { imports = [ - ./awww.nix + ./browser.nix ./easyeffects.nix - ./fuzzel.nix - ./gaming.nix + ./email.nix + ./kdeconnect.nix + ./kdenlive.nix + ./mangohud.nix ./media.nix ./nixcord.nix - ./satty.nix + ./obs.nix + ./obsidian.nix + ./onlyoffice.nix ./spicetify.nix - ./swayidle.nix - ./swaylock.nix + ./torrent.nix + ./vpn.nix ]; } diff --git a/hm/soft/spicetify.nix b/hm/soft/spicetify.nix index 96c4d0d..59ed287 100644 --- a/hm/soft/spicetify.nix +++ b/hm/soft/spicetify.nix @@ -1,13 +1,12 @@ { inputs, pkgs, config, lib, ... }: let - cfg = config.szpont.hm.soft.spicetify; + cfg = config.hm.soft.spicetify; spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system}; in { imports = [ inputs.spicetify-nix.homeManagerModules.default ]; - options.szpont.hm.soft.spicetify.enable = lib.mkEnableOption "spicetify config"; - + options.hm.soft.spicetify.enable = lib.mkEnableOption "spicetify config"; config = lib.mkIf cfg.enable { programs.spicetify = { enable = true; diff --git a/hm/soft/torrent.nix b/hm/soft/torrent.nix new file mode 100644 index 0000000..63150c2 --- /dev/null +++ b/hm/soft/torrent.nix @@ -0,0 +1,12 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.hm.soft.torrent; +in +{ + options.hm.soft.torrent.enable = lib.mkEnableOption "torrenting software / qbittorrent"; + config = lib.mkIf cfg.enable { + home.packages = with pkgs; [ + qbittorrent-enhanced + ]; + }; +} diff --git a/hm/soft/vpn.nix b/hm/soft/vpn.nix new file mode 100644 index 0000000..7b83d57 --- /dev/null +++ b/hm/soft/vpn.nix @@ -0,0 +1,22 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.hm.soft.vpn; +in +{ + options.hm.soft.vpn = { + enable = lib.mkEnableOption "enables vpn clients"; + + protonvpn.enable = lib.mkEnableOption "protonvpn"; + mullvad.enable = lib.mkEnableOption "mullvad vpn"; + }; + config = lib.mkIf cfg.enable (lib.mkMerge [ + (lib.mkIf cfg.mullvad.enable { + programs.mullvad-vpn = { + enable = true; + }; + }) + (lib.mkIf cfg.protonvpn.enable { + home.packages = [ pkgs.protonvpn-gui ]; + }) + ]); +} |