diff options
| -rw-r--r-- | hm/conf/xdg-dirs.nix | 4 | ||||
| -rw-r--r-- | hm/shell/cli.nix | 15 | ||||
| -rw-r--r-- | hm/soft/browser.nix | 18 | ||||
| -rw-r--r-- | hm/soft/nixcord.nix | 7 | ||||
| -rw-r--r-- | hosts/desktop/configuration.nix | 2 | ||||
| -rw-r--r-- | hosts/laptop/configuration.nix | 5 | ||||
| -rw-r--r-- | os/core/storage.nix | 13 | ||||
| -rw-r--r-- | os/srv/nix-helper.nix | 2 |
8 files changed, 46 insertions, 20 deletions
diff --git a/hm/conf/xdg-dirs.nix b/hm/conf/xdg-dirs.nix index c6cf03b..d779dba 100644 --- a/hm/conf/xdg-dirs.nix +++ b/hm/conf/xdg-dirs.nix @@ -34,6 +34,8 @@ in XDG_MEDIA_DIR = "${toString cfg.mediaPath}"; XDG_SS_DIR = "${toString cfg.mediaPath}/pics/ss"; XDG_CLIPS_DIR = "${toString cfg.mediaPath}/vids/clips"; + XDG_MOVIES_DIR = "${toString cfg.mediaPath}/movies"; + XDG_ANIME_DIR = "${toString cfg.mediaPath}/anime"; XDG_ARCHIVE_DIR = "${toString cfg.mediaPath}/archive"; }; }; @@ -43,6 +45,8 @@ in XDG_MEDIA_DIR = "${toString cfg.mediaPath}"; XDG_SS_DIR = "${toString cfg.mediaPath}/pics/ss"; XDG_CLIPS_DIR = "${toString cfg.mediaPath}/vids/clips"; + XDG_MOVIES_DIR = "${toString cfg.mediaPath}/movies"; + XDG_ANIME_DIR = "${toString cfg.mediaPath}/anime"; XDG_ARCHIVE_DIR = "${toString cfg.mediaPath}/archive"; }; }; diff --git a/hm/shell/cli.nix b/hm/shell/cli.nix index fa4f3fc..c20b9c2 100644 --- a/hm/shell/cli.nix +++ b/hm/shell/cli.nix @@ -5,9 +5,10 @@ in { options.hm.shell.cli.enable = lib.mkEnableOption "modern cli tools"; config = lib.mkIf cfg.enable { - programs.zoxide.enable = true; - programs.zoxide.options = [ "--cmd cd" ]; - + programs.zoxide = { + enable = true; + options = [ "--cmd cd" ]; + }; programs.bat = { enable = true; config.theme = "gruvbox-dark"; @@ -18,10 +19,15 @@ in programs.fd.enable = true; programs.ripgrep.enable = true; programs.yazi.enable = true; - programs.btop.enable = true; programs.fastfetch.enable = true; programs.direnv.enable = true; + programs.jq.enable = true; + programs.nix-your-shell = { + enable = true; + enableFishIntegration = true; + nix-output-monitor.enable = true; + }; home.packages = with pkgs; [ srm @@ -30,7 +36,6 @@ in chafa hexyl procs - jq yq-go tldr ]; diff --git a/hm/soft/browser.nix b/hm/soft/browser.nix index f1dd97f..e46e482 100644 --- a/hm/soft/browser.nix +++ b/hm/soft/browser.nix @@ -11,6 +11,24 @@ in (lib.mkIf cfg.librewolf.enable { programs.librewolf = { enable = true; + profiles = { + main = { + name = "main"; + # bookmarks.configFile = ./bookmarks; + extensions = { + + }; + search = { + + }; + settings = { + + }; + }; + }; + settings = { + "ui.key.menuAccessKeyFocuses" = false; + }; }; }) diff --git a/hm/soft/nixcord.nix b/hm/soft/nixcord.nix index adbdc58..c948a4d 100644 --- a/hm/soft/nixcord.nix +++ b/hm/soft/nixcord.nix @@ -45,14 +45,13 @@ in betterRoleContext.enable = true; betterSettings.enable = true; betterUploadButton.enable = true; - betterUserArea.enable = true; + betterUserArea = { enable = true; alwaysShowUsername = false; }; biggerStreamPreview.enable = true; - bypassPinPrompt.enable = true; + bypassPinPrompt.enable = true; callTimer.enable = true; cleanChannelName.enable = true; components.enable = true; copyFileContents.enable = true; - crashHandler.enable = true; customTimestamps.enable = true; disableCallIdle.enable = true; disableDeepLinks.enable = true; @@ -148,7 +147,7 @@ in voiceMessages.enable = true; voiceRejoin.enable = true; volumeBooster.enable = true; - webScreenShareFixes.enable = true; + # webScreenShareFixes.enable = true; whoReacted.enable = true; whosWatching.enable = true; youtubeAdblock.enable = true; diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 37ed03a..4956dbe 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -44,7 +44,7 @@ ssh.enable = true; storage = { enable = true; - keepDays = 30; + cleanDates = "monthly"; }; users.enable = true; }; diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 7688f33..9112b0f 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -35,10 +35,7 @@ power.enable = true; security.enable = true; ssh.enable = true; - storage = { - enable = true; - keepDays = 14; - }; + storage.enable = true; users.enable = true; }; srv = { diff --git a/os/core/storage.nix b/os/core/storage.nix index b498084..e4e282b 100644 --- a/os/core/storage.nix +++ b/os/core/storage.nix @@ -6,10 +6,10 @@ in options.os.core.storage = { enable = lib.mkEnableOption "enables storage management"; - keepDays = lib.mkOption { + cleanDates = lib.mkOption { type = lib.types.int; - default = 14; - description = "Number of days to keep old Nix generations before GC"; + default = "weekly"; + description = "how often to clean the system of old generations"; }; }; config = lib.mkIf cfg.enable { @@ -17,8 +17,11 @@ in programs.nh = { enable = true; - clean.enable = true; - clean.extraArgs = "--keep-days ${toString cfg.keepDays} --keep 5"; + clean = { + enable = true; + dates = "${toString cfg.cleanDates}"; + clean.extraArgs = "--keep 5"; + }; }; services.fstrim.enable = true; diff --git a/os/srv/nix-helper.nix b/os/srv/nix-helper.nix index 4999908..fede111 100644 --- a/os/srv/nix-helper.nix +++ b/os/srv/nix-helper.nix @@ -12,7 +12,7 @@ in programs.nh = { enable = true; - flake = "/etc/nixos"; + osFlake = "/etc/nixos"; }; environment.systemPackages = with pkgs; [ |