diff options
Diffstat (limited to 'home-manager')
| -rw-r--r-- | home-manager/general.nix | 66 | ||||
| -rw-r--r-- | home-manager/homeModules/emacs/default.nix | 47 | ||||
| -rw-r--r-- | home-manager/homeModules/fish.nix | 29 | ||||
| -rw-r--r-- | home-manager/homeModules/rofi.nix | 51 |
4 files changed, 112 insertions, 81 deletions
diff --git a/home-manager/general.nix b/home-manager/general.nix index 9aa3427..e3c1412 100644 --- a/home-manager/general.nix +++ b/home-manager/general.nix @@ -1,42 +1,49 @@ -{ pkgs, inputs, outputs, config, lib, ... }: -let +{ + pkgs, + inputs, + outputs, + config, + lib, + ... +}: let username = "jerpo"; homeDirectory = "/home/${username}"; configHome = "${homeDirectory}/.config"; cliPkgs = with pkgs; [ fd - jq - zip - tldr + jq + zip wget btop - unzip + unzip p7zip - ffmpeg - ripgrep - xdragon - steam-run - python311 - xdg-utils - pkg-config - ghostscript - adwaita-icon-theme - pokemon-colorscripts - nix-prefetch-scripts + ffmpeg + flatpak + ripgrep + xdragon + tealdeer + steam-run + python311 + xdg-utils + pkg-config + ghostscript + adwaita-icon-theme + pokemon-colorscripts + nix-prefetch-scripts ]; nogamesPkgs = with pkgs; [ vkd3d steam - bottles - gamemode + bottles open-sans + osu-lazer-bin ]; baconPkgs = with pkgs; [ vesktop telegram-desktop - libreoffice-fresh + libreoffice-fresh transmission_4-gtk ]; @@ -44,8 +51,7 @@ let kubectl kubernetes-helm ]; -in -{ +in { imports = [ ./homeModules ]; @@ -54,7 +60,7 @@ in overlays = [ outputs.overlays.additions outputs.overlays.modifications - outputs.overlays.unstable-packages + outputs.overlays.truly-unstable-packages ]; config = { allowUnfree = true; @@ -62,7 +68,6 @@ in }; }; - home = { inherit username homeDirectory; stateVersion = "23.05"; @@ -79,23 +84,28 @@ in lib.meta = { configPath = "${config.home.homeDirectory}/nixfiles/"; - mkMutableSymlink = path: config.lib.file.mkOutOfStoreSymlink + mkMutableSymlink = path: + config.lib.file.mkOutOfStoreSymlink (config.lib.meta.configPath + lib.strings.removePrefix (toString inputs.self) (toString path)); }; # from homeModules stylixConfig.enable = true; stylixConfig.theme = "everforest"; - + emacs.enable = true; + emacs.package = pkgs.emacs30; alacritty.enable = true; fish.enable = true; - firefox.enable = true; zen-browser.enable = true; - nvf.enable = true; tmux.enable = true; + programs.nix-index-database.comma.enable = true; + programs.nix-index = { + enable = true; + }; + programs.home-manager.enable = true; } diff --git a/home-manager/homeModules/emacs/default.nix b/home-manager/homeModules/emacs/default.nix index b108bab..7a8b66f 100644 --- a/home-manager/homeModules/emacs/default.nix +++ b/home-manager/homeModules/emacs/default.nix @@ -1,4 +1,9 @@ -{ pkgs, config, lib, ... }: +{ + pkgs, + config, + lib, + ... +}: let mkMutableSymlink = config.lib.meta.mkMutableSymlink; @@ -10,28 +15,32 @@ in }; config = lib.mkIf config.emacs.enable { home.sessionVariables.EDITOR = "emacsclient -a emacs"; - home.packages = with pkgs; with python311Packages; [ - # required dependencies - ripgrep - fd - tree-sitter - emacs-all-the-icons-fonts - libappindicator - poppler_utils - nixd - nixpkgs-fmt - sqlite - ]; - + home.packages = + with pkgs; + with python311Packages; + [ + # required dependencies + ripgrep + fd + tree-sitter + emacs-all-the-icons-fonts + libappindicator + poppler_utils + nixd + alejandra + sqlite + ]; + programs.emacs = { enable = true; package = config.emacs.package; - extraPackages = epkgs: with epkgs; [ - treesit-grammars.with-all-grammars - mu4e - ]; + extraPackages = + epkgs: with epkgs; [ + treesit-grammars.with-all-grammars + mu4e + ]; }; - + xdg.configFile = { "emacs/early-init.el".source = mkMutableSymlink ./early-init.el; "emacs/init.el".source = mkMutableSymlink ./init.el; diff --git a/home-manager/homeModules/fish.nix b/home-manager/homeModules/fish.nix index 7591383..b539e84 100644 --- a/home-manager/homeModules/fish.nix +++ b/home-manager/homeModules/fish.nix @@ -1,6 +1,9 @@ -{ pkgs, config, lib, ... }: - { + pkgs, + config, + lib, + ... +}: { options = { fish.enable = lib.mkEnableOption "enable fish"; }; @@ -9,18 +12,26 @@ enable = true; nix-direnv.enable = true; }; - + + programs.nix-index.enableFishIntegration = true; + programs.fish = { enable = true; plugins = [ - { name = "pure"; src = pkgs.fishPlugins.pure.src; } - { name = "autopair"; src = pkgs.fishPlugins.autopair.src; } + { + name = "pure"; + src = pkgs.fishPlugins.pure.src; + } + { + name = "autopair"; + src = pkgs.fishPlugins.autopair.src; + } ]; interactiveShellInit = '' - set fish_greeting - pokemon-colorscripts -r --no-title - ''; - + set fish_greeting + pokemon-colorscripts -r --no-title + ''; + shellAliases = { ls = "ls --hyperlink=auto --color=auto"; }; diff --git a/home-manager/homeModules/rofi.nix b/home-manager/homeModules/rofi.nix index 3d93f53..48434ec 100644 --- a/home-manager/homeModules/rofi.nix +++ b/home-manager/homeModules/rofi.nix @@ -1,37 +1,39 @@ -{ pkgs, config, lib, ... }: - { + pkgs, + config, + lib, + ... +}: { options = { rofi.enable = lib.mkEnableOption "enable rofi"; - rofi.package = lib.mkPackageOption pkgs "rofi package" { default = [ "rofi-wayland" ]; }; + rofi.package = lib.mkPackageOption pkgs "rofi package" {default = ["rofi"];}; }; - + config = lib.mkIf config.rofi.enable { programs.rofi = { enable = true; package = config.rofi.package; - theme = - with config.lib.stylix.colors.withHashtag; + theme = with config.lib.stylix.colors.withHashtag; builtins.toFile "theme.rasi" '' - * { - font: "FiraCode Nerd Font Medium 12"; - - bg0: ${base01}; - bg1: ${base02}; - fg0: ${base04}; - - accent-color: ${base03}; - urgent-color: #ffffff; - - background-color: transparent; - text-color: @fg0; - - margin: 0; - padding: 0; - spacing: 0; - } + * { + font: "FiraCode Nerd Font Medium 12"; + + bg0: ${base01}; + bg1: ${base02}; + fg0: ${base04}; + + accent-color: ${base03}; + urgent-color: #ffffff; + + background-color: transparent; + text-color: @fg0; + + margin: 0; + padding: 0; + spacing: 0; + } - ${builtins.readFile ./attachments/rofi-theme.rasi}''; + ${builtins.readFile ./attachments/rofi-theme.rasi}''; cycle = true; plugins = with pkgs; [ rofi-emoji @@ -44,4 +46,3 @@ }; }; } - |