From fedfe43f289cf787889266214bc8a648a8606153 Mon Sep 17 00:00:00 2001 From: joy Date: Sat, 19 Oct 2024 19:50:22 +0200 Subject: [PATCH] uh --- flake.lock | 18 +++++++-------- modules/games/steam/default.nix | 3 ++- modules/programs/home/foot/default.nix | 24 ++++++++++---------- modules/programs/home/xdg/default.nix | 7 ++++++ modules/programs/home/yazi/default.nix | 15 +++++++++++- modules/programs/home/zsh/scripts/rebuild.sh | 2 ++ modules/system/misc/default.nix | 3 +++ modules/wm/clip/default.nix | 2 +- 8 files changed, 50 insertions(+), 24 deletions(-) create mode 100644 modules/programs/home/xdg/default.nix diff --git a/flake.lock b/flake.lock index e3b84ef..bfded22 100644 --- a/flake.lock +++ b/flake.lock @@ -96,11 +96,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1729260790, - "narHash": "sha256-QhsyaQ7PAJ3W0k2oYoNkCwBTd+Sr6Z2IZfU8o7j7cKY=", + "lastModified": 1729321532, + "narHash": "sha256-3/d/mbLQhrkE1qK2Ut/mrMElE6fP9t6ITJoRQ6F+D7o=", "owner": "rycee", "repo": "nur-expressions", - "rev": "5fb9e4cb8f9c47d0edac20d23c39f878a7602e5b", + "rev": "70087c8c6e491dcc0bbff459073b480b1a72ac1c", "type": "gitlab" }, "original": { @@ -202,11 +202,11 @@ ] }, "locked": { - "lastModified": 1729260213, - "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=", + "lastModified": 1729321331, + "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=", "owner": "nix-community", "repo": "home-manager", - "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75", + "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68", "type": "github" }, "original": { @@ -311,11 +311,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { diff --git a/modules/games/steam/default.nix b/modules/games/steam/default.nix index c51775e..e97f5a8 100644 --- a/modules/games/steam/default.nix +++ b/modules/games/steam/default.nix @@ -8,12 +8,13 @@ games.enable = lib.mkEnableOption ""; }; config = lib.mkIf config.games.enable { - programs.steam.enable = true; + # programs.steam.enable = true; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "steam-original" "steam" "steam-run" + "steam-unwrapped-1.0.0.81" ]; environment.systemPackages = with pkgs; [ mangohud diff --git a/modules/programs/home/foot/default.nix b/modules/programs/home/foot/default.nix index c7daef8..6078fff 100644 --- a/modules/programs/home/foot/default.nix +++ b/modules/programs/home/foot/default.nix @@ -1,20 +1,20 @@ -{ lib, ... }: { +{lib, ...}: { programs.foot = { enable = true; settings = { - # terminal = { - # padding = "5 5"; - # }; + main = { + pad = "2x2"; + }; colors = { - # "bright-black" = lib.mkForce "#504945"; - # "bright-red" = lib.mkForce "#fb4934"; - # "bright-green" = lib.mkForce "#b8bb26"; - # "bright-yellow" = lib.mkForce "#fabd2f"; - # "bright-blue" = lib.mkForce "#83a598"; - # "bright-magenta" = lib.mkForce "#d3869b"; - # "bright-cyan" = lib.mkForce "#8ec07c"; - # "bright-white" = lib.mkForce "#ebdbb2"; + "bright0" = lib.mkForce "504945"; + "bright1" = lib.mkForce "fb4934"; + "bright2" = lib.mkForce "b8bb26"; + "bright3" = lib.mkForce "fabd2f"; + "bright4" = lib.mkForce "83a598"; + "bright5" = lib.mkForce "d3869b"; + "bright6" = lib.mkForce "8ec07c"; + "bright7" = lib.mkForce "ebdbb2"; }; }; }; diff --git a/modules/programs/home/xdg/default.nix b/modules/programs/home/xdg/default.nix new file mode 100644 index 0000000..9842670 --- /dev/null +++ b/modules/programs/home/xdg/default.nix @@ -0,0 +1,7 @@ +{config, ...}: { + xdg.userDirs = { + enable = true; + download = "${config.home.homeDirectory}/dl"; + desktop = "${config.home.homeDirectory}/dl"; + }; +} diff --git a/modules/programs/home/yazi/default.nix b/modules/programs/home/yazi/default.nix index 2ae4438..3087c54 100644 --- a/modules/programs/home/yazi/default.nix +++ b/modules/programs/home/yazi/default.nix @@ -1,3 +1,16 @@ { - programs.yazi.enable = true; + programs.yazi = { + enable = true; + settings = { + opener = { + edit = [ + { + run = "hx \"$@\""; + block = true; + for = "unix"; + } + ]; + }; + }; + }; } diff --git a/modules/programs/home/zsh/scripts/rebuild.sh b/modules/programs/home/zsh/scripts/rebuild.sh index a738ae7..5a86863 100755 --- a/modules/programs/home/zsh/scripts/rebuild.sh +++ b/modules/programs/home/zsh/scripts/rebuild.sh @@ -4,6 +4,8 @@ current_dir=$(pwd) cd ~/nix || exit +alejandra . + git fetch if git diff --quiet HEAD..origin/main; then diff --git a/modules/system/misc/default.nix b/modules/system/misc/default.nix index 925984f..c2b8885 100644 --- a/modules/system/misc/default.nix +++ b/modules/system/misc/default.nix @@ -6,4 +6,7 @@ users.defaultUserShell = pkgs.zsh; services.xserver.excludePackages = [pkgs.xterm]; programs.nano.enable = false; + # environment.systemPackages = [ + # pkgs.vim + # ]; } diff --git a/modules/wm/clip/default.nix b/modules/wm/clip/default.nix index 436a86b..4db3f91 100644 --- a/modules/wm/clip/default.nix +++ b/modules/wm/clip/default.nix @@ -4,6 +4,6 @@ wl-clipboard ]; - # services.cliphist.enable = true; + services.cliphist.enable = true; }; }