From 9a93e8e4b5cf3b726fc787380e341f7c77fee1be Mon Sep 17 00:00:00 2001 From: vali Date: Wed, 15 May 2024 01:09:41 +0200 Subject: [PATCH] added tldr, changed some structure stuff --- hosts/vali/mars/configuration.nix | 3 --- hosts/vali/mars/programs.nix | 2 ++ FreeBSD.png => lib/wallpapers/FreeBSD.png | Bin modules/cli/fish.nix | 5 ++--- modules/gui/stylix.nix | 4 ++-- modules/gui/vivado.nix | 2 +- 6 files changed, 7 insertions(+), 9 deletions(-) rename FreeBSD.png => lib/wallpapers/FreeBSD.png (100%) diff --git a/hosts/vali/mars/configuration.nix b/hosts/vali/mars/configuration.nix index 753c595..b9dc2ab 100644 --- a/hosts/vali/mars/configuration.nix +++ b/hosts/vali/mars/configuration.nix @@ -39,16 +39,13 @@ btop.enable = true; mpv.enable = true; kitty.enable = true; - # awesome.enable = true; hyprland.enable = true; newsboat.enable = true; - # emacs.enable = true; fish.enable = true; stylix.enable = true; helix.enable = true; nh.enable = true; schizofox.enable = true; - # spicetify.enable = true; anyrun.enable = true; }; services = { pipewire.enable = true; }; diff --git a/hosts/vali/mars/programs.nix b/hosts/vali/mars/programs.nix index ff5dbf7..fe38d53 100644 --- a/hosts/vali/mars/programs.nix +++ b/hosts/vali/mars/programs.nix @@ -83,9 +83,11 @@ in { spotube steam strawberry + svls teamspeak_client telegram-desktop texliveFull + tldr trilium-desktop thunderbird tor-browser-bundle-bin diff --git a/FreeBSD.png b/lib/wallpapers/FreeBSD.png similarity index 100% rename from FreeBSD.png rename to lib/wallpapers/FreeBSD.png diff --git a/modules/cli/fish.nix b/modules/cli/fish.nix index 75ccfbd..4189cb3 100644 --- a/modules/cli/fish.nix +++ b/modules/cli/fish.nix @@ -59,7 +59,7 @@ in { cc = "cd ~ && clear"; mv = "mv -iv"; rm = "trash -v"; - ls = "eza"; + ls = "eza --icons"; l = "eza -a --icons"; la = "eza -lha --icons --git"; kys = "shutdown now"; @@ -68,8 +68,7 @@ in { v = "nvim"; h = "hx"; e = "emacs"; - update = - ''sudo nixos-rebuild switch --flake "${gitPath}#${hostname}"''; + update = ''nh os switch "${gitPath}"''; flake = "cd '${gitPath}'"; } // cfg.extraAliases; }; diff --git a/modules/gui/stylix.nix b/modules/gui/stylix.nix index 601d384..692237e 100644 --- a/modules/gui/stylix.nix +++ b/modules/gui/stylix.nix @@ -10,7 +10,7 @@ in { home-manager.users.${username} = { stylix = { polarity = "dark"; - image = ../../FreeBSD.png; + image = ../../lib/wallpapers/FreeBSD.png; base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-soft.yaml"; autoEnable = true; @@ -71,7 +71,7 @@ in { }; }; stylix = { - image = ../../FreeBSD.png; + image = ../../lib/wallpapers/FreeBSD.png; polarity = "dark"; }; }; diff --git a/modules/gui/vivado.nix b/modules/gui/vivado.nix index b6ecc86..159c35f 100644 --- a/modules/gui/vivado.nix +++ b/modules/gui/vivado.nix @@ -1,4 +1,4 @@ -{ pkgs, nur, ... }: +{ pkgs, ... }: let vivado-desktop-symbol = pkgs.makeDesktopItem {