From 3a0434de7c5a5bf221512b9c2fcf94acc5f51214 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Fri, 30 Aug 2024 02:47:19 -0700 Subject: update --- home/ebisu/fortune/development/nix/default.nix | 5 ++++- home/ebisu/fortune/editor/default.nix | 3 ++- home/ebisu/fortune/filesystem/default.nix | 4 +--- home/ebisu/fortune/rice/fastfetch.nix | 2 +- home/ebisu/fortune/utility/ai/default.nix | 3 ++- modules/datetime.nix | 3 ++- modules/environment/system-packages.nix | 4 ---- modules/nix.nix | 14 ++++++-------- modules/programs/default.nix | 2 +- modules/services/default.nix | 2 +- modules/xdg-portal.nix | 2 +- pkgs/zen-browser-bin.nix | 2 +- 12 files changed, 22 insertions(+), 24 deletions(-) diff --git a/home/ebisu/fortune/development/nix/default.nix b/home/ebisu/fortune/development/nix/default.nix index 6fa9049..17b1186 100644 --- a/home/ebisu/fortune/development/nix/default.nix +++ b/home/ebisu/fortune/development/nix/default.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ home.packages = with pkgs; [ nil statix @@ -8,5 +9,7 @@ nix-prefetch-git nixpkgs-fmt nixfmt-rfc-style + nix-tree + nix-visualize ]; } diff --git a/home/ebisu/fortune/editor/default.nix b/home/ebisu/fortune/editor/default.nix index 183fb72..974f849 100644 --- a/home/ebisu/fortune/editor/default.nix +++ b/home/ebisu/fortune/editor/default.nix @@ -1,6 +1,6 @@ { pkgs, config, ... }: { - imports = [ ./vscode-fhs.nix ]; + # imports = [ ./vscode-fhs.nix ]; home.packages = with pkgs; [ emacs @@ -8,5 +8,6 @@ # jetbrains.clion lunarvim zed-editor + vscode ]; } diff --git a/home/ebisu/fortune/filesystem/default.nix b/home/ebisu/fortune/filesystem/default.nix index c830b18..698084c 100644 --- a/home/ebisu/fortune/filesystem/default.nix +++ b/home/ebisu/fortune/filesystem/default.nix @@ -9,11 +9,9 @@ # programs.lf.enable = true; home.packages = with pkgs; [ - cinnamon.nemo + nemo dust dysk - gparted - # file-roller ncdu file ]; diff --git a/home/ebisu/fortune/rice/fastfetch.nix b/home/ebisu/fortune/rice/fastfetch.nix index fed2677..14980d9 100644 --- a/home/ebisu/fortune/rice/fastfetch.nix +++ b/home/ebisu/fortune/rice/fastfetch.nix @@ -5,7 +5,7 @@ settings = { logo = { - source = "~/Downloads/91363-1550240807.jpg"; + source = "~/Downloads/91363-1550240807.png"; width = 30; padding = { diff --git a/home/ebisu/fortune/utility/ai/default.nix b/home/ebisu/fortune/utility/ai/default.nix index 7513348..2ac248a 100644 --- a/home/ebisu/fortune/utility/ai/default.nix +++ b/home/ebisu/fortune/utility/ai/default.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ home.packages = with pkgs; [ ollama-cuda shell-gpt diff --git a/modules/datetime.nix b/modules/datetime.nix index 2e4fbe0..9d9bbbb 100644 --- a/modules/datetime.nix +++ b/modules/datetime.nix @@ -6,7 +6,8 @@ defaultLocale = "en_US.UTF-8"; inputMethod = { - enabled = "fcitx5"; + enable = true; + type = "fcitx5"; fcitx5 = { waylandFrontend = true; diff --git a/modules/environment/system-packages.nix b/modules/environment/system-packages.nix index 6f480d7..85251d9 100644 --- a/modules/environment/system-packages.nix +++ b/modules/environment/system-packages.nix @@ -4,10 +4,6 @@ vim wget git - gtk2 - gtk3 - gtk4 mediastreamer-openh264 - usbutils ]; } diff --git a/modules/nix.nix b/modules/nix.nix index 26d79ef..65413f0 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -2,14 +2,9 @@ nixpkgs.config.allowUnfree = true; nix = { - allowedUsers = [ - "root" - "@wheel" - ]; - settings = { auto-optimise-store = true; - http-connections = 50; + http-connections = 0; warn-dirty = false; log-lines = 50; # sandbox = "relaxed"; @@ -19,6 +14,11 @@ "@wheel" ]; + allowed-users = [ + "root" + "@wheel" + ]; + substituters = [ "https://nix-community.cachix.org" "https://hyprland.cachix.org" @@ -36,7 +36,5 @@ dates = "weekly"; options = "--delete-older-than 7d"; }; - - # distributedBuilds = true; }; } diff --git a/modules/programs/default.nix b/modules/programs/default.nix index c4ce8ca..0cec34e 100644 --- a/modules/programs/default.nix +++ b/modules/programs/default.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { - imports = [ ./hyprland.nix ]; + # imports = [ ./hyprland.nix ]; programs = { fish.enable = true; diff --git a/modules/services/default.nix b/modules/services/default.nix index 1caaa15..4b630d6 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -8,7 +8,7 @@ ]; services = { - # printing.enable = true; + printing.enable = false; gnome.gnome-keyring.enable = true; fstrim.enable = true; gvfs.enable = true; diff --git a/modules/xdg-portal.nix b/modules/xdg-portal.nix index 1eab8e7..36407f3 100644 --- a/modules/xdg-portal.nix +++ b/modules/xdg-portal.nix @@ -2,7 +2,7 @@ { xdg.portal = { enable = true; - # config.common.default = "*"; + config.common.default = "*"; # wlr.enable = true; # xdgOpenUsePortal = true; diff --git a/pkgs/zen-browser-bin.nix b/pkgs/zen-browser-bin.nix index 51a95db..914a03c 100644 --- a/pkgs/zen-browser-bin.nix +++ b/pkgs/zen-browser-bin.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/zen-browser/desktop/releases/download/${version}/zen.linux-specific.tar.bz2"; - hash = "sha256-5Z+RG5UwSHM6sC1WT5KHgwL0cco2DlMTSteEfnLGrlo="; + hash = "sha256-IRheE/4EhK8I7aCEDmbhwSrvxISKU6e42ezAp+FnH/M=="; }; desktopItems = [ desktopItem ]; -- cgit v1.2.3