summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hm/env/theme.nix5
-rw-r--r--hm/soft/browser.nix11
-rw-r--r--hm/soft/easyeffects.nix12
-rw-r--r--hm/soft/email.nix8
-rw-r--r--hm/soft/media.nix40
-rw-r--r--hm/soft/mpv.nix63
-rw-r--r--hm/soft/nixcord.nix212
-rw-r--r--hm/soft/soft.nix3
-rw-r--r--hm/soft/vpn.nix6
-rw-r--r--hm/soft/yt-dlp.nix16
-rw-r--r--hosts/desktop/configuration.nix2
-rw-r--r--hosts/laptop/configuration.nix4
-rw-r--r--hosts/laptop/home.nix7
-rw-r--r--os/core/audio.nix (renamed from sys/core/audio.nix)2
-rw-r--r--os/core/bootloader.nix (renamed from sys/core/bootloader.nix)0
-rw-r--r--os/core/core.nix (renamed from sys/core/core.nix)0
-rw-r--r--os/core/drivers.nix (renamed from sys/core/drivers.nix)0
-rw-r--r--os/core/fonts.nix (renamed from sys/core/fonts.nix)0
-rw-r--r--os/core/greet.nix (renamed from sys/core/greet.nix)0
-rw-r--r--os/core/home-manager.nix (renamed from sys/core/home-manager.nix)0
-rw-r--r--os/core/localization.nix (renamed from sys/core/localization.nix)0
-rw-r--r--os/core/memory.nix (renamed from sys/core/memory.nix)0
-rw-r--r--os/core/networking.nix (renamed from sys/core/networking.nix)0
-rw-r--r--os/core/power.nix (renamed from sys/core/power.nix)0
-rw-r--r--os/core/security.nix (renamed from sys/core/security.nix)1
-rw-r--r--os/core/storage.nix (renamed from sys/core/storage.nix)0
-rw-r--r--os/core/users.nix (renamed from sys/core/users.nix)1
-rw-r--r--os/default.nix (renamed from sys/default.nix)0
-rw-r--r--os/srv/autoclicker.nix12
-rw-r--r--os/srv/compat.nix (renamed from sys/srv/compat.nix)0
-rw-r--r--os/srv/docker.nix (renamed from sys/srv/docker.nix)0
-rw-r--r--os/srv/files.nix (renamed from sys/srv/files.nix)0
-rw-r--r--os/srv/gaming.nix (renamed from sys/srv/gaming.nix)0
-rw-r--r--os/srv/kvm.nix (renamed from sys/srv/kvm.nix)0
-rw-r--r--os/srv/nix-helper.nix (renamed from sys/srv/nix-helper.nix)4
-rw-r--r--os/srv/ollama.nix (renamed from sys/srv/ollama.nix)0
-rw-r--r--os/srv/srv.nix (renamed from sys/srv/srv.nix)1
-rw-r--r--os/wm/niri.nix (renamed from sys/wm/niri.nix)0
-rw-r--r--os/wm/wm.nix (renamed from sys/wm/wm.nix)0
39 files changed, 221 insertions, 189 deletions
diff --git a/hm/env/theme.nix b/hm/env/theme.nix
index 761e394..0915024 100644
--- a/hm/env/theme.nix
+++ b/hm/env/theme.nix
@@ -4,11 +4,10 @@ let
in
{
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 [
+ config = lib.mkMerge [
(lib.mkIf cfg.gtk.enable {
gtk = {
enable = true;
@@ -30,5 +29,5 @@ in
platformTheme.name = "adwaita";
};
})
- ]);
+ ];
}
diff --git a/hm/soft/browser.nix b/hm/soft/browser.nix
index 023dce8..8b9e6dc 100644
--- a/hm/soft/browser.nix
+++ b/hm/soft/browser.nix
@@ -4,23 +4,16 @@ let
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 [
+ config = 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
deleted file mode 100644
index ab16736..0000000
--- a/hm/soft/easyeffects.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, lib, ... }:
-let
- cfg = config.hm.soft.easyeffects;
-in
-{
- 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
index d7ec9ea..d60f802 100644
--- a/hm/soft/email.nix
+++ b/hm/soft/email.nix
@@ -4,18 +4,16 @@ let
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 [
+ config = lib.mkMerge [
(lib.mkIf cfg.thunderbird.enable {
- programs.librewolf.enable = true;
+ programs.thunderbird.enable = true;
})
(lib.mkIf cfg.evolution.enable {
home.packages = [ pkgs.evolution ];
})
- ]);
+ ];
}
diff --git a/hm/soft/media.nix b/hm/soft/media.nix
index 5b4b06f..b330908 100644
--- a/hm/soft/media.nix
+++ b/hm/soft/media.nix
@@ -3,47 +3,13 @@ let
cfg = config.hm.soft.media;
in
{
- options.hm.soft.media.enable = lib.mkEnableOption "media playback and processing tools";
+ options.hm.soft.media.enable = lib.mkEnableOption "media cli tools";
config = lib.mkIf cfg.enable {
- programs.mpv = {
- enable = true;
- config = {
- profile = "gpu-hq";
- vo = "gpu-next";
- hwdec = "auto-safe";
- save-position-on-quit = true;
- keep-open = "yes";
- sub-auto = "fuzzy";
- volume-max = "200";
- };
- scripts = with pkgs.mpvScripts; [
- webtorrent-mpv-hook
- visualizer
- videoclip
- thumbfast
- reload
- mpv-subtitle-lines
- mpv-notify-send
- mpv-cheatsheet
- modernz
- # modernx
- memo
- # builtins.autoload
- autosubsync-mpv
- autosub
- ];
- };
- programs.yt-dlp = {
- enable = true;
- package = pkgs.yt-dlp_git;
- };
-
home.packages = with pkgs; [
- anime4k
- syncplay-nogui
ffmpeg
imagemagick
- exiftool
+ syncplay-nogui
];
};
}
+
diff --git a/hm/soft/mpv.nix b/hm/soft/mpv.nix
new file mode 100644
index 0000000..8df73e7
--- /dev/null
+++ b/hm/soft/mpv.nix
@@ -0,0 +1,63 @@
+{ config, lib, pkgs, ... }:
+let
+ cfg = config.hm.soft.mpv;
+ shim_dir = "${pkgs.mpv-shim-default-shaders}/share/mpv-shim-default-shaders/shaders";
+ anime4k_dir = "${pkgs.anime4k}"
+in
+{
+ options.hm.soft.mpv.enable = lib.mkEnableOption "mpv media player";
+ config = lib.mkIf cfg.enable {
+ home.packages = with pkgs; [
+ anime4k
+ mpv-shim-default-shaders
+ ];
+ programs.mpv = {
+ enable = true;
+ config = {
+ # general stuff
+ save-position-on-quit = true;
+ keep-open = "yes";
+
+ # video
+ profile = "gpu-hq";
+ gpu-api = "vulkan";
+ vo = "gpu-next";
+ hwdec = "auto";
+
+ # audio
+ ao = "pipewire";
+ sub-auto = "fuzzy";
+ volume-max = "200";
+
+ # network streaming
+ demuxer-max-back-bytes = "50Mib";
+ demuxer-max-bytes = "600Mib";
+ demuxer-readahead-secs = 300;
+ force-seekable = "yes";
+
+ # screenshotting
+ screenshot-format = "png";
+ screenshot-directory = "~/${config.hm.conf.xdg-dirs.mediaPath}/pics/ss";
+ screenshot-template = "mpv-%f-%wH.%wM.%wS-#%#00n";
+ };
+ scripts = with pkgs.mpvScripts; [
+ webtorrent-mpv-hook
+ visualizer
+ videoclip
+ thumbfast
+ reload
+ mpv-subtitle-lines
+ mpv-notify-send
+ mpv-cheatsheet
+ modernx
+ memo
+ autosubsync-mpv
+ autosub
+ ];
+ };
+ hm.soft = {
+ media.enable = true;
+ yt-dlp.enable = true;
+ };
+ };
+}
diff --git a/hm/soft/nixcord.nix b/hm/soft/nixcord.nix
index d31f807..7021f7c 100644
--- a/hm/soft/nixcord.nix
+++ b/hm/soft/nixcord.nix
@@ -18,112 +18,112 @@ in
};
config = {
frameless = true;
- # plugins = {
- # alwaysExpandRoles = { enable = true; hideArrow = true; };
- # alwaysTrust = { enable = true; domain = false; };
- # anammox.enable = true;
- # betterAudioPlayer.enable = true;
- # betterGifAltText.enable = true;
- # betterGifPicker.enable = true;
- # betterInvites.enable = true;
- # betterNotesBox = { enable = true; hide = true; };
- # betterQuickReact = { enable = true; columns = 6.0; rows = 1.0; compactMode = true; };
- # betterRoleContext.enable = true;
- # betterUploadButton.enable = true;
- # biggerStreamPreview.enable = true;
- # callTimer.enable = true;
- # characterCounter = { enable = true; colorEffects = false; };
- # cleanChannelName.enable = true;
- # clearUrLs.enable = true;
- # copyFileContents.enable = true;
- # copyStickerLinks.enable = true;
- # crashHandler.enable = true;
- # customTimestamps.enable = true;
- # disableCallIdle.enable = true;
- # disableDeepLinks.enable = true;
- # dontRoundMyTimestamps.enable = true;
- # equicordHelper = { enable = true; noMirroredCamera = true; };
- # expressionCloner.enable = true;
- # fakeNitro = { enable = true; enableEmojiBypass = false; enableStickerBypass = false; };
- # favoriteEmojiFirst.enable = true;
- # fixCodeblockGap.enable = true;
- # fixFileExtensions.enable = true;
- # fixImagesQuality.enable = true;
- # fixSpotifyEmbeds.enable = true;
- # fixYoutubeEmbeds.enable = true;
- # forceOwnerCrown.enable = true;
- # friendsSince.enable = true;
- # fullSearchContext.enable = true;
- # fullUserInChatbox.enable = true;
- # gifCollections = { enable = true; preventDuplicates = true; showCopyImageLink = true; };
- # gifRoulette = { enable = true; pingOwnerChance = true; };
- # guildTagSettings.enable = true;
- # homeTyping.enable = true;
- # ignoreTerms.enable = true;
- # iLoveSpam.enable = true;
- # imageFilename.enable = true;
- # imageLink.enable = true;
- # imageZoom = { enable = true; nearestNeighbour = true; saveZoomValues = true; square = true; };
- # imgToGif.enable = true;
- # inRole.enable = true;
- # inviteDefaults.enable = true;
- # memberCount.enable = true;
- # mentionAvatars = { enable = true; showAtSymbol = true; };
- # messageLinkEmbeds.enable = true;
- # messageLogger = { enable = true; ignoreSelf = true; };
- # moyai.enable = true;
- # musicControls.enable = true;
- # neverPausePreviews.enable = true;
- # newGuildSettings = { enable = true; messages = 1; };
- # newPluginsManager.enable = true;
- # noF1.enable = true;
- # noMaskedUrlPaste.enable = true;
- # noModalAnimation.enable = true;
- # noNitroUpsell.enable = true;
- # noOnboardingDelay.enable = true;
- # noMosaic.enable = true;
- # noProfileThemes.enable = true;
- # noSystemBadge.enable = true;
- # noTypingAnimation.enable = true;
- # overrideForumDefaults = { enable = true; defaultLayout = 2; };
- # onePingPerDm.enable = true;
- # openInApp.enable = true;
- # pauseInvitesForever.enable = true;
- # permissionFreeWill = { enable = true; lockout = false; };
- # permissionsViewer.enable = true;
- # pinDMs = { enable = true; canCollapseDmSection = true; };
- # pinIcon.enable = true;
- # platformIndicators.enable = true;
- # quoter.enable = true;
- # relationshipNotifier.enable = true;
- # roleColorEverywhere.enable = true;
- # saveFavoriteGiFs.enable = true;
- # sendTimestamps.enable = true;
- # serverInfo.enable = true;
- # showConnections.enable = true;
- # showHiddenChannels = { enable = true; };
- # showHiddenThings.enable = true;
- # showResourceChannels.enable = true;
- # showTimeoutDuration.enable = true;
- # spotifyCrack = { enable = true; noSpotifyAutoPause = false; };
- # streamerModeOnStream.enable = true;
- # typingIndicator = { enable = true; indicatorMode = 2; };
- # typingTweaks.enable = true;
- # unindent.enable = true;
- # universalMention = { enable = true; globalMention = true; };
- # unlimitedAccounts.enable = true;
- # unlockedAvatarZoom.enable = true;
- # userVoiceShow.enable = true;
- # validReply.enable = true;
- # validUser.enable = true;
- # viewIcons = { enable = true; format = "png"; };
- # voiceMessages.enable = true;
- # volumeBooster.enable = true;
- # whoReacted.enable = true;
- # whosWatching.enable = true;
- # youtubeAdblock.enable = true;
- # youtubeDescription.enable = true;
- # };
+ plugins = {
+ alwaysExpandRoles = { enable = true; hideArrow = true; };
+ alwaysTrust = { enable = true; domain = false; };
+ anammox.enable = true;
+ betterAudioPlayer.enable = true;
+ betterGifAltText.enable = true;
+ betterGifPicker.enable = true;
+ betterInvites.enable = true;
+ betterNotesBox = { enable = true; hide = true; };
+ betterQuickReact = { enable = true; columns = 6.0; rows = 1.0; compactMode = true; };
+ betterRoleContext.enable = true;
+ betterUploadButton.enable = true;
+ biggerStreamPreview.enable = true;
+ callTimer.enable = true;
+ characterCounter = { enable = true; colorEffects = false; };
+ cleanChannelName.enable = true;
+ clearUrLs.enable = true;
+ copyFileContents.enable = true;
+ copyStickerLinks.enable = true;
+ crashHandler.enable = true;
+ customTimestamps.enable = true;
+ disableCallIdle.enable = true;
+ disableDeepLinks.enable = true;
+ dontRoundMyTimestamps.enable = true;
+ equicordHelper = { enable = true; noMirroredCamera = true; };
+ expressionCloner.enable = true;
+ fakeNitro = { enable = true; enableEmojiBypass = false; enableStickerBypass = false; };
+ favoriteEmojiFirst.enable = true;
+ fixCodeblockGap.enable = true;
+ fixFileExtensions.enable = true;
+ fixImagesQuality.enable = true;
+ fixSpotifyEmbeds.enable = true;
+ fixYoutubeEmbeds.enable = true;
+ forceOwnerCrown.enable = true;
+ friendsSince.enable = true;
+ fullSearchContext.enable = true;
+ fullUserInChatbox.enable = true;
+ gifCollections = { enable = true; preventDuplicates = true; showCopyImageLink = true; };
+ gifRoulette = { enable = true; pingOwnerChance = true; };
+ guildTagSettings.enable = true;
+ homeTyping.enable = true;
+ ignoreTerms.enable = true;
+ iLoveSpam.enable = true;
+ imageFilename.enable = true;
+ imageLink.enable = true;
+ imageZoom = { enable = true; nearestNeighbour = true; saveZoomValues = true; square = true; };
+ imgToGif.enable = true;
+ inRole.enable = true;
+ inviteDefaults.enable = true;
+ memberCount.enable = true;
+ mentionAvatars = { enable = true; showAtSymbol = true; };
+ messageLinkEmbeds.enable = true;
+ messageLogger = { enable = true; ignoreSelf = true; };
+ moyai.enable = true;
+ musicControls.enable = true;
+ neverPausePreviews.enable = true;
+ newGuildSettings = { enable = true; messages = 1; };
+ newPluginsManager.enable = true;
+ noF1.enable = true;
+ noMaskedUrlPaste.enable = true;
+ noModalAnimation.enable = true;
+ noNitroUpsell.enable = true;
+ noOnboardingDelay.enable = true;
+ noMosaic.enable = true;
+ noProfileThemes.enable = true;
+ noSystemBadge.enable = true;
+ noTypingAnimation.enable = true;
+ overrideForumDefaults = { enable = true; defaultLayout = 2; };
+ onePingPerDm.enable = true;
+ openInApp.enable = true;
+ pauseInvitesForever.enable = true;
+ permissionFreeWill = { enable = true; lockout = false; };
+ permissionsViewer.enable = true;
+ pinDMs = { enable = true; canCollapseDmSection = true; };
+ pinIcon.enable = true;
+ platformIndicators.enable = true;
+ quoter.enable = true;
+ relationshipNotifier.enable = true;
+ roleColorEverywhere.enable = true;
+ saveFavoriteGiFs.enable = true;
+ sendTimestamps.enable = true;
+ serverInfo.enable = true;
+ showConnections.enable = true;
+ showHiddenChannels = { enable = true; };
+ showHiddenThings.enable = true;
+ showResourceChannels.enable = true;
+ showTimeoutDuration.enable = true;
+ spotifyCrack = { enable = true; noSpotifyAutoPause = false; };
+ streamerModeOnStream.enable = true;
+ typingIndicator = { enable = true; indicatorMode = 2; };
+ typingTweaks.enable = true;
+ unindent.enable = true;
+ universalMention = { enable = true; globalMention = true; };
+ unlimitedAccounts.enable = true;
+ unlockedAvatarZoom.enable = true;
+ userVoiceShow.enable = true;
+ validReply.enable = true;
+ validUser.enable = true;
+ viewIcons = { enable = true; format = "png"; };
+ voiceMessages.enable = true;
+ volumeBooster.enable = true;
+ whoReacted.enable = true;
+ whosWatching.enable = true;
+ youtubeAdblock.enable = true;
+ youtubeDescription.enable = true;
+ };
};
};
};
diff --git a/hm/soft/soft.nix b/hm/soft/soft.nix
index 191ada7..bb5018a 100644
--- a/hm/soft/soft.nix
+++ b/hm/soft/soft.nix
@@ -2,12 +2,12 @@
{
imports = [
./browser.nix
- ./easyeffects.nix
./email.nix
./kdeconnect.nix
./kdenlive.nix
./mangohud.nix
./media.nix
+ ./mpv.nix
./nixcord.nix
./obs.nix
./obsidian.nix
@@ -15,5 +15,6 @@
./spicetify.nix
./torrent.nix
./vpn.nix
+ ./yt-dlp.nix
];
}
diff --git a/hm/soft/vpn.nix b/hm/soft/vpn.nix
index 7b83d57..47bd959 100644
--- a/hm/soft/vpn.nix
+++ b/hm/soft/vpn.nix
@@ -4,12 +4,10 @@ let
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 [
+ config = lib.mkMerge [
(lib.mkIf cfg.mullvad.enable {
programs.mullvad-vpn = {
enable = true;
@@ -18,5 +16,5 @@ in
(lib.mkIf cfg.protonvpn.enable {
home.packages = [ pkgs.protonvpn-gui ];
})
- ]);
+ ];
}
diff --git a/hm/soft/yt-dlp.nix b/hm/soft/yt-dlp.nix
new file mode 100644
index 0000000..4773464
--- /dev/null
+++ b/hm/soft/yt-dlp.nix
@@ -0,0 +1,16 @@
+{ config, lib, pkgs, ... }:
+let
+ cfg = config.hm.soft.yt-dlp;
+in
+{
+ options.hm.soft.yt-dlp.enable = lib.mkEnableOption "youtube content downloading tool";
+ config = lib.mkIf cfg.enable {
+ programs.yt-dlp = {
+ enable = true;
+ package = pkgs.yt-dlp_git;
+ settings = {
+
+ };
+ };
+ };
+}
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 0482f23..434565e 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -6,7 +6,7 @@
inputs.disko.nixosModules.disko
./hardware-configuration.nix
- ../../sys/default.nix
+ ../../os/default.nix
];
boot.kernelParams = [
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index d9f458a..2862021 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -1,10 +1,10 @@
-{ username, inputs, ... }:
+{ username, ... }:
{
system.stateVersion = "25.05";
imports = [
./hardware-configuration.nix
- ../../sys/default.nix
+ ../../os/default.nix
];
sys = {
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index b56a4de..244e1f6 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -23,7 +23,6 @@
waybar.enable = true;
themes = {
- enable = true;
gtk.enable = true;
qt.enable = true;
};
@@ -36,16 +35,16 @@
};
soft = {
browser = {
- enable = true;
librewolf.enable = true;
};
email = {
- enable = true;
thunderbird.enable = false;
- evolution.enable = true;
+ evolution.enable = false;
};
kdeconnect.enable = true;
+ mpv.enable = true;
media.enable = true;
+ yt-dlp.enable = true;
nixcord.enable = true;
obsidian.enable = true;
spicetify.enable = true;
diff --git a/sys/core/audio.nix b/os/core/audio.nix
index 234b6bd..4868c7d 100644
--- a/sys/core/audio.nix
+++ b/os/core/audio.nix
@@ -26,7 +26,5 @@ in
helvum
alsa-utils
];
-
- home-manager.users.${username}.hm.soft.easyeffects.enable = true;
};
}
diff --git a/sys/core/bootloader.nix b/os/core/bootloader.nix
index ff0aad5..ff0aad5 100644
--- a/sys/core/bootloader.nix
+++ b/os/core/bootloader.nix
diff --git a/sys/core/core.nix b/os/core/core.nix
index 428d7ea..428d7ea 100644
--- a/sys/core/core.nix
+++ b/os/core/core.nix
diff --git a/sys/core/drivers.nix b/os/core/drivers.nix
index c769786..c769786 100644
--- a/sys/core/drivers.nix
+++ b/os/core/drivers.nix
diff --git a/sys/core/fonts.nix b/os/core/fonts.nix
index 1173439..1173439 100644
--- a/sys/core/fonts.nix
+++ b/os/core/fonts.nix
diff --git a/sys/core/greet.nix b/os/core/greet.nix
index 95603e8..95603e8 100644
--- a/sys/core/greet.nix
+++ b/os/core/greet.nix
diff --git a/sys/core/home-manager.nix b/os/core/home-manager.nix
index 7bc4b18..7bc4b18 100644
--- a/sys/core/home-manager.nix
+++ b/os/core/home-manager.nix
diff --git a/sys/core/localization.nix b/os/core/localization.nix
index 4d45b75..4d45b75 100644
--- a/sys/core/localization.nix
+++ b/os/core/localization.nix
diff --git a/sys/core/memory.nix b/os/core/memory.nix
index 956cc73..956cc73 100644
--- a/sys/core/memory.nix
+++ b/os/core/memory.nix
diff --git a/sys/core/networking.nix b/os/core/networking.nix
index 314feb7..314feb7 100644
--- a/sys/core/networking.nix
+++ b/os/core/networking.nix
diff --git a/sys/core/power.nix b/os/core/power.nix
index f67665e..f67665e 100644
--- a/sys/core/power.nix
+++ b/os/core/power.nix
diff --git a/sys/core/security.nix b/os/core/security.nix
index bf43577..cfc8bf6 100644
--- a/sys/core/security.nix
+++ b/os/core/security.nix
@@ -33,7 +33,6 @@ in
environment.systemPackages = with pkgs; [
veracrypt
bitwarden-desktop
- hello
];
};
}
diff --git a/sys/core/storage.nix b/os/core/storage.nix
index 693e5e7..693e5e7 100644
--- a/sys/core/storage.nix
+++ b/os/core/storage.nix
diff --git a/sys/core/users.nix b/os/core/users.nix
index fb4e7f0..d0af69f 100644
--- a/sys/core/users.nix
+++ b/os/core/users.nix
@@ -17,6 +17,7 @@ in
(lib.mkIf (config.sys.core.network.enable or false) [ "networkmanager" ])
(lib.mkIf (config.sys.srv.kvm.enable or false) [ "libvirtd" ])
(lib.mkIf (config.sys.srv.docker.enable or false) [ "docker" ])
+ (lib.mkIf (config.sys.srv.autoclicker.enable or false) [ "input" ])
];
};
};
diff --git a/sys/default.nix b/os/default.nix
index 225c08f..225c08f 100644
--- a/sys/default.nix
+++ b/os/default.nix
diff --git a/os/srv/autoclicker.nix b/os/srv/autoclicker.nix
new file mode 100644
index 0000000..84cba2e
--- /dev/null
+++ b/os/srv/autoclicker.nix
@@ -0,0 +1,12 @@
+{ config, lib, pkgs, ... }:
+let
+ cfg = config.sys.srv.autoclicker;
+in
+{
+ options.sys.srv.autoclicker.enable = lib.mkEnableOption "enables wl-autoclicker";
+ config = lib.mkIf cfg.enable {
+ environment.systemPackages = with pkgs; [
+ wl-autoclicker
+ ];
+ };
+}
diff --git a/sys/srv/compat.nix b/os/srv/compat.nix
index ab9560f..ab9560f 100644
--- a/sys/srv/compat.nix
+++ b/os/srv/compat.nix
diff --git a/sys/srv/docker.nix b/os/srv/docker.nix
index 0ed1541..0ed1541 100644
--- a/sys/srv/docker.nix
+++ b/os/srv/docker.nix
diff --git a/sys/srv/files.nix b/os/srv/files.nix
index 9b5759e..9b5759e 100644
--- a/sys/srv/files.nix
+++ b/os/srv/files.nix
diff --git a/sys/srv/gaming.nix b/os/srv/gaming.nix
index ee7f608..ee7f608 100644
--- a/sys/srv/gaming.nix
+++ b/os/srv/gaming.nix
diff --git a/sys/srv/kvm.nix b/os/srv/kvm.nix
index 2cf8c26..2cf8c26 100644
--- a/sys/srv/kvm.nix
+++ b/os/srv/kvm.nix
diff --git a/sys/srv/nix-helper.nix b/os/srv/nix-helper.nix
index 5eb3353..6a64201 100644
--- a/sys/srv/nix-helper.nix
+++ b/os/srv/nix-helper.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, username, ... }:
let
cfg = config.sys.srv.nix-helper;
in
@@ -6,7 +6,7 @@ in
options.sys.srv.nix-helper.enable = lib.mkEnableOption "enables nix-helper";
config = lib.mkIf cfg.enable {
nix.settings = {
- trusted-users = [ "root" "adam" ];
+ trusted-users = [ "root" "${username}" ];
experimental-features = [ "nix-command" "flakes" ];
};
diff --git a/sys/srv/ollama.nix b/os/srv/ollama.nix
index 11babd6..11babd6 100644
--- a/sys/srv/ollama.nix
+++ b/os/srv/ollama.nix
diff --git a/sys/srv/srv.nix b/os/srv/srv.nix
index 19e959e..2da7d50 100644
--- a/sys/srv/srv.nix
+++ b/os/srv/srv.nix
@@ -1,6 +1,7 @@
{ ... }:
{
imports = [
+ ./autoclicker
./compat.nix
./docker.nix
./files.nix
diff --git a/sys/wm/niri.nix b/os/wm/niri.nix
index c92b068..c92b068 100644
--- a/sys/wm/niri.nix
+++ b/os/wm/niri.nix
diff --git a/sys/wm/wm.nix b/os/wm/wm.nix
index 5374264..5374264 100644
--- a/sys/wm/wm.nix
+++ b/os/wm/wm.nix