From 4e413fb5cfd873cea1a65cb05e09f08220e54b1b Mon Sep 17 00:00:00 2001 From: cnst Date: Sat, 7 Sep 2024 13:21:37 +0200 Subject: [PATCH] readme changes --- home/README.md | 69 ++++------------- home/users/adam/default.nix | 37 ---------- home/users/adam/git.nix | 7 -- home/users/adam/modules.nix | 102 -------------------------- home/users/adam/shell.nix | 71 ------------------ hosts/README.md | 8 +- system/README.md | 88 +++++----------------- system/modules/utils/misc/default.nix | 1 + 8 files changed, 39 insertions(+), 344 deletions(-) delete mode 100644 home/users/adam/default.nix delete mode 100644 home/users/adam/git.nix delete mode 100644 home/users/adam/modules.nix delete mode 100644 home/users/adam/shell.nix diff --git a/home/README.md b/home/README.md index c2f4061c..20cda585 100644 --- a/home/README.md +++ b/home/README.md @@ -1,55 +1,18 @@ ``` -├── home -│   ├── etc -│   │   ├── dconf -│   │   ├── gtk -│   │   ├── polkit -│   │   └── xdg -│   ├── modules -│   │   ├── browsers -│   │   │   ├── chromium -│   │   │   └── firefox -│   │   ├── comm -│   │   │   └── discord -│   │   ├── devtools -│   │   │   ├── neovim -│   │   │   │   └── plugins -│   │   │   └── vscode -│   │   ├── gaming -│   │   │   ├── lutris -│   │   │   └── mangohud -│   │   ├── media -│   │   ├── studio -│   │   ├── terminal -│   │   │   ├── alacritty -│   │   │   ├── foot -│   │   │   ├── kitty -│   │   │   ├── wezterm -│   │   │   └── zellij -│   │   ├── userd -│   │   │   ├── copyq -│   │   │   ├── mako -│   │   │   ├── sops -│   │   │   └── udiskie -│   │   ├── utils -│   │   │   ├── ags -│   │   │   ├── anyrun -│   │   │   ├── misc -│   │   │   ├── rofi -│   │   │   ├── waybar -│   │   │   └── yazi -│   │   │   └── theme -│   │   └── wm -│   │   ├── hyprland -│   │   │   ├── adam -│   │   │   ├── cnst -│   │   │   └── toothpick -│   │   └── utils -│   │   ├── hypridle -│   │   ├── hyprlock -│   │   └── hyprpaper -│   └── users -│   ├── adam -│   ├── cnst -│   └── toothpick +home +├── etc +├── modules +│   ├── browsers +│   ├── comm +│   ├── devtools +│   ├── gaming +│   ├── terminal +│   ├── userd +│   ├── utils +│   └── wm +│   ├── hyprland +│   └── utils +└── users + ├── cnst + └── toothpick ``` diff --git a/home/users/adam/default.nix b/home/users/adam/default.nix deleted file mode 100644 index 743fc90a..00000000 --- a/home/users/adam/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{pkgs, ...}: { - imports = [ - ./modules.nix - ./git.nix - ./shell.nix - ]; - home = { - username = "adam"; - homeDirectory = "/home/adam"; - stateVersion = "23.11"; - extraOutputsToInstall = ["doc" "devdoc"]; - - packages = with pkgs; [ - # misc.system - brightnessctl - bun - ]; - sessionVariables = { - BROWSER = "firefox"; - EDITOR = "nvim"; - TERM = "xterm-256color"; - - QT_QPA_PLATFORM = "wayland"; - SDL_VIDEODRIVER = "wayland"; - XDG_SESSION_TYPE = "wayland"; - }; - }; - # disable manuals as nmd fails to build often - manual = { - html.enable = false; - json.enable = false; - manpages.enable = false; - }; - - # let HM manage itself when in standalone mode - programs.home-manager.enable = true; -} diff --git a/home/users/adam/git.nix b/home/users/adam/git.nix deleted file mode 100644 index b1baad01..00000000 --- a/home/users/adam/git.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - programs.git = { - enable = true; - userName = "cnst"; - userEmail = "adamhilmersson@gmail.com"; - }; -} diff --git a/home/users/adam/modules.nix b/home/users/adam/modules.nix deleted file mode 100644 index 5a0b6f18..00000000 --- a/home/users/adam/modules.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ - modules = { - browsers = { - firefox = { - enable = true; - }; - chromium = { - enable = false; - }; - }; - comm = { - discord = { - enable = true; - }; - }; - devtools = { - neovim = { - enable = true; - }; - vscode = { - enable = false; - }; - }; - gaming = { - lutris = { - enable = false; - }; - mangohud = { - enable = false; - }; - }; - terminal = { - alacritty = { - enable = true; - }; - foot = { - enable = true; - }; - kitty = { - enable = true; - }; - zellij = { - enable = false; - }; - }; - userd = { - copyq = { - enable = true; - }; - mako = { - enable = true; - }; - udiskie = { - enable = true; - }; - }; - utils = { - ags = { - enable = false; - }; - anyrun = { - enable = false; - }; - rofi = { - enable = false; - }; - waybar = { - enable = true; - }; - yazi = { - enable = true; - }; - misc = { - enable = true; - }; - }; - wm = { - hyprland = { - cnst = { - enable = false; - }; - toothpick = { - enable = false; - }; - adam = { - enable = true; - }; - }; - utils = { - hypridle = { - enable = true; - }; - hyprlock = { - enable = true; - }; - hyprpaper = { - enable = true; - }; - }; - }; - }; -} diff --git a/home/users/adam/shell.nix b/home/users/adam/shell.nix deleted file mode 100644 index 855c6a0c..00000000 --- a/home/users/adam/shell.nix +++ /dev/null @@ -1,71 +0,0 @@ -{config, ...}: { - programs.zsh = { - enable = true; - dotDir = ".config/zsh"; - enableCompletion = true; - autosuggestion.enable = true; - syntaxHighlighting.enable = true; - - shellAliases = { - usermodules = "nvim /home/adam/.nix-config/home/users/adam/modules.nix"; - umod = "nvim /home/adam/.nix-config/home/users/adam/modules.nix"; - systemmodules = "nvim /home/adam/.nix-config/hosts/adampad/modules.nix"; - smod = "nvim /home/adam/.nix-config/hosts/adampad/modules.nix"; - nixclean = "sudo nix run /home/adam/.nix-config#cleanup-boot"; - nixdev = "nix develop ~/.nix-config -c $SHELL"; - nixconfig = "cd /home/adam/.nix-config/"; - ll = "ls -l"; - nixupdate = "nh os switch -v -H adampad && sudo nix run /home/adam/.nix-config#cleanup-boot"; - nixup = "nh os switch -H adampad && sudo nix run /home/adam/.nix-config#cleanup-boot"; - flakeupdate = "nh os switch -u -v -H adampad && sudo nix run /home/adam/.nix-config#cleanup-boot"; - flakeup = "nh os switch -u -H adampad && sudo nix run /home/adam/.nix-config#cleanup-boot"; - }; - history = { - size = 1000; - path = "${config.xdg.dataHome}/zsh/history"; - }; - oh-my-zsh = { - enable = true; - plugins = [ - "git" - # "thefuck" - ]; - theme = "robbyrussell"; - }; - profileExtra = '' - export PATH="$HOME/.local/bin:$PATH" - ''; - initExtraFirst = '' - autoload -U colors && colors - ''; - initExtra = '' - ZSH_THEME_GIT_PROMPT_PREFIX="%F{143}(%F{167}" - ZSH_THEME_GIT_PROMPT_SUFFIX="%f " - ZSH_THEME_GIT_PROMPT_DIRTY="%F{143}) %F{202}%1{✗%}" - ZSH_THEME_GIT_PROMPT_CLEAN="%F{143})" - - ZSH_THEME_RUBY_PROMPT_PREFIX="%F{167}‹" - ZSH_THEME_RUBY_PROMPT_SUFFIX="›%f" - - # Check if we're in a nix-shell or nix develop environment - if [[ -n "$IN_NIX_SHELL" ]]; then - PROMPT='%F{red}󰫱󰫲󰬃%f%F{143}%~%f $(git_prompt_info)$(virtualenv_prompt_info) - %F{143}$ ' - else - PROMPT='%F{143}%~%f $(git_prompt_info)$(virtualenv_prompt_info) - %F{143}$ ' - fi - - RPROMPT='$(ruby_prompt_info)' - - VIRTUAL_ENV_DISABLE_PROMPT=0 - ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX=" %F{66}🐍 " - ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX="%f" - ZSH_THEME_VIRTUALENV_PREFIX=$ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX - ZSH_THEME_VIRTUALENV_SUFFIX=$ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX - - ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=241' - microfetch - ''; - }; -} diff --git a/hosts/README.md b/hosts/README.md index 279701e7..68d15980 100644 --- a/hosts/README.md +++ b/hosts/README.md @@ -1,6 +1,6 @@ ``` -├── hosts -│   ├── adampad -│   ├── cnix -│   └── toothpc +hosts +├── adampad +├── cnix +└── toothpc ``` diff --git a/system/README.md b/system/README.md index d6d6b2f2..f8bd4265 100644 --- a/system/README.md +++ b/system/README.md @@ -1,72 +1,20 @@ ``` -└── system - ├── boot - │   └── lanzaboote - ├── etc - │   ├── dconf - │   ├── fonts - │   ├── locale - │   ├── security - │   ├── xdg - │   ├── xserver - │   │   ├── amd - │   │   │   └── hhkbse - │   │   └── nvidia - │   ├── zram - │   └── zsh - ├── modules - │   ├── gaming - │   │   ├── gamemode - │   │   ├── gamescope - │   │   ├── lutris - │   │   └── steam - │   ├── gui - │   │   ├── gnome - │   │   └── hyprland - │   ├── hardware - │   │   ├── bluetooth - │   │   ├── graphics - │   │   │   ├── amd - │   │   │   └── nvidia - │   │   └── logitech - │   ├── network - │   ├── studio - │   │   ├── blender - │   │   ├── gimp - │   │   └── inkscape - │   ├── sysd - │   │   ├── blueman - │   │   ├── dbus - │   │   ├── fwupd - │   │   ├── gnome-keyring - │   │   ├── greetd - │   │   ├── gvfs - │   │   ├── locate - │   │   ├── mullvad - │   │   ├── pipewire - │   │   ├── powerd - │   │   ├── samba - │   │   ├── sops - │   │   ├── ssh - │   │   ├── udisks - │   │   └── xserver - │   │   ├── amd - │   │   │   └── hhkbse - │   │   └── nvidia - │   └── utils - │   ├── android - │   ├── anyrun - │   ├── corectrl - │   ├── microfetch - │   └── nix-ld - └── nix - ├── home-manager - ├── nh - │   ├── adampad - │   ├── cnix - │   └── toothpc - ├── nixpkgs - ├── shell - └── substituters - +system +├── boot +│   └── lanzaboote +├── dev +├── etc +├── modules +│   ├── gaming +│   ├── gui +│   ├── hardware +│   ├── studio +│   ├── sysd +│   │   ├── network +│   │   ├── security +│   │   ├── session +│   │   └── system +│   └── utils +└── nix +    └── utils ``` diff --git a/system/modules/utils/misc/default.nix b/system/modules/utils/misc/default.nix index 1d1ce125..b5e029b4 100644 --- a/system/modules/utils/misc/default.nix +++ b/system/modules/utils/misc/default.nix @@ -17,6 +17,7 @@ in { pkgs.fd pkgs.beekeeper-studio pkgs.gnused + pkgs.tree ]; }; }