Moved some files

This commit is contained in:
FredzyW 2024-06-17 17:53:23 +02:00
parent 2f94e9b5ff
commit 8a26dfc281
33 changed files with 25 additions and 42 deletions

View file

@ -9,22 +9,22 @@
... ...
}: { }: {
imports = [ imports = [
../moduler/common/dwm.nix ../shared/dwm.nix
../moduler/common/dmenu.nix ../shared/dmenu.nix
../moduler/common/kitty.nix ../shared/kitty.nix
../moduler/common/tmux.nix ../shared/tmux.nix
../moduler/common/vim.nix ../shared/vim.nix
../moduler/common/fish.nix ../shared/fish.nix
../moduler/common/git.nix ../shared/git.nix
../moduler/common/nixpkgs.nix ../shared/nixpkgs.nix
../moduler/common/firefox.nix ../shared/firefox.nix
../moduler/common/zathura.nix ../shared/zathura.nix
../moduler/common/lazygit.nix ../shared/lazygit.nix
../moduler/common/spotifyd.nix ../shared/spotifyd.nix
../moduler/common/ssh.nix ../shared/ssh.nix
../moduler/common/aerc.nix ../shared/aerc.nix
../moduler/common/rbw.nix ../shared/rbw.nix
../moduler/common/oh-my-posh.nix ../shared/oh-my-posh.nix
]; ];
nixpkgs = { nixpkgs = {

View file

@ -10,11 +10,11 @@
... ...
}: { }: {
imports = [ imports = [
../moduler/common/git.nix ../shared/git.nix
../moduler/common/tmux.nix ../shared/tmux.nix
../moduler/common/nixpkgs.nix ../shared/nixpkgs.nix
../moduler/common/lazygit.nix ../shared/lazygit.nix
../moduler/common/zsh-server.nix ../shared/zsh-server.nix
]; ];
nixpkgs = { nixpkgs = {

View file

@ -13,7 +13,7 @@
./hardware-configuration.nix ./hardware-configuration.nix
../../config/base.nix ../../config/base.nix
../../config/users.nix ../../config/users.nix
../../moduler/common/nginx.nix ../../shared/nginx.nix
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

View file

@ -12,7 +12,7 @@
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
../../config/users.nix ../../config/users.nix
../../moduler/common/nginx.nix ../../shared/nginx.nix
]; ];
networking.hostName = myhostname; networking.hostName = myhostname;

View file

@ -1,4 +1,4 @@
{ pkgs, lib, ... }: { pkgs, ... }:
{ {
programs.fish = { programs.fish = {
enable = true; enable = true;
@ -20,14 +20,6 @@
name = "foreign-env"; name = "foreign-env";
src = pkgs.fishPlugins.foreign-env.src; src = pkgs.fishPlugins.foreign-env.src;
} }
# {
# name = "pure";
# src = pkgs.fishPlugins.pure.src;
# }
# {
# name = "tide";
# src = pkgs.fishPlugins.tide.src;
# }
{ {
name = "fzf"; name = "fzf";
src = pkgs.fishPlugins.fzf.src; src = pkgs.fishPlugins.fzf.src;
@ -50,20 +42,11 @@
ls="exa -lag --header"; ls="exa -lag --header";
dev="nix develop --command fish"; dev="nix develop --command fish";
spot="steam-run ~/program/spotify_player"; spot="steam-run ~/program/spotify_player";
sc="sc-im";
}; };
interactiveShellInit = '' interactiveShellInit = ''
set fish_greeting # Disable greeting set fish_greeting # Disable greeting
set -Ux FZF_DEFAULT_OPTS "--color=fg:#f8f8f2,bg:#282a36,hl:#bd93f9 --color=fg+:#f8f8f2,bg+:#44475a,hl+:#bd93f9 --color=info:#ffb86c,prompt:#50fa7b,pointer:#ff79c6 --color=marker:#ff79c6,spinner:#ffb86c,header:#6272a4" set -Ux FZF_DEFAULT_OPTS "--color=fg:#f8f8f2,bg:#282a36,hl:#bd93f9 --color=fg+:#f8f8f2,bg+:#44475a,hl+:#bd93f9 --color=info:#ffb86c,prompt:#50fa7b,pointer:#ff79c6 --color=marker:#ff79c6,spinner:#ffb86c,header:#6272a4"
# set --universal pure_symbol_prompt 
# set --universal pure_enable_nixdevshell true
# set --universal pure_color_primary f5a97f
# set --universal pure_color_danger ed8796
# set --universal pure_color_success a6da95
# set --universal pure_color_warning eed49f
# set --universal pure_color_light f4dbd6
# set --universal pure_color_mute c6a0f6
# set --universal pure_color_danger ed8796
# set --universal pure_color_danger ed8796
''; '';
}; };
} }