servius/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[feat] nixfmt and change the hyprpaper module

Browse Source
This commit is contained in:
uttarayan21
2024-03-05 11:30:24 +05:30
parent e9c95ee2e9
commit e698f4de80
13 changed files with 139 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
config/nix/common/firefox.nix
View File

@@ -2,20 +2,18 @@
programs.firefox = {
enable = device.isLinux;
profiles.default = {
userChrome =
let
csshacks = pkgs.fetchFromGitHub {
owner = "MrOtherGuy";
repo = "firefox-csshacks";
rev = "master";
sha256 = "sha256-XJ+MTEADzOsCIh0I8EAxbtIpDHfMJsN68sKBy7/1l60=";
};
in
''
@import url(${csshacks}/chrome/toolbars_below_content.css);
@import url(${csshacks}/chrome/scrollable_menupopups.css);
@import url(${csshacks}/chrome/linux_gtk_window_control_patch.css);
'';
userChrome = let
csshacks = pkgs.fetchFromGitHub {
owner = "MrOtherGuy";
repo = "firefox-csshacks";
rev = "master";
sha256 = "sha256-XJ+MTEADzOsCIh0I8EAxbtIpDHfMJsN68sKBy7/1l60=";
};
in ''
@import url(${csshacks}/chrome/toolbars_below_content.css);
@import url(${csshacks}/chrome/scrollable_menupopups.css);
@import url(${csshacks}/chrome/linux_gtk_window_control_patch.css);
'';
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
privacy-badger
bitwarden

41
config/nix/common/home.nix
View File

@@ -3,14 +3,13 @@ let
# https://mipmip.github.io/home-manager-option-search/
start-tmux = (import ../scripts/start-tmux.nix) pkgs;
lazy = false;
in
{
in {
imports = [
# Include the results of the hardware scan.
./tmux.nix
./wezterm.nix
] ++ (if device.isLinux then [ ../linux ] else [ ])
++ (if !lazy then [ ./nvim ] else [ ]);
++ (if !lazy then [ ./nvim ] else [ ]);
home.packages = with pkgs;
[
@@ -158,14 +157,13 @@ in
enable = true;
enableFishIntegration = true;
enableNushellIntegration = true;
settings =
let flavour = "mocha"; # Replace with your preferred palette
in {
# Other config here
format = "$all"; # Remove this line to disable the default prompt format
palette = "catppuccin_${flavour}";
} // builtins.fromTOML (builtins.readFile (pkgs.catppuccinThemes.starship
+ /palettes/${flavour}.toml));
settings = let flavour = "mocha"; # Replace with your preferred palette
in {
# Other config here
format = "$all"; # Remove this line to disable the default prompt format
palette = "catppuccin_${flavour}";
} // builtins.fromTOML (builtins.readFile
(pkgs.catppuccinThemes.starship + /palettes/${flavour}.toml));
};
eza = {
enable = true;
@@ -193,11 +191,10 @@ in
enable = true;
config = { theme = "catppuccin"; };
themes = {
catppuccin =
{
src = "${pkgs.catppuccinThemes.bat}/themes";
file = "Catppuccin Mocha.tmTheme";
};
catppuccin = {
src = "${pkgs.catppuccinThemes.bat}/themes";
file = "Catppuccin Mocha.tmTheme";
};
};
};
@@ -206,7 +203,8 @@ in
settings = {
email = "uttarayan21@gmail.com";
base_url = "https://pass.uttarayan.me";
pinenttry = if device.isMac then pkgs.pinentry_mac else pkgs.pinentry-qt;
pinenttry =
if device.isMac then pkgs.pinentry_mac else pkgs.pinentry-qt;
};
};
# Let Home Manager install and manage itself.
@@ -218,11 +216,10 @@ in
# Home Manager needs a bit of information about you and the paths it should
# manage.
username = device.user;
homeDirectory =
if device.isMac then
lib.mkForce "/Users/${device.user}"
else
lib.mkForce "/home/${device.user}";
homeDirectory = if device.isMac then
lib.mkForce "/Users/${device.user}"
else
lib.mkForce "/home/${device.user}";
stateVersion = "23.11";

17
config/nix/common/nvim/default.nix
View File

@@ -21,9 +21,7 @@
undofile = true;
};
globals = {
mapleader = " ";
};
globals = { mapleader = " "; };
plugins = {
lspconfig = {
enable = true;
@@ -31,7 +29,7 @@
nil = {
enable = true;
extraConfig =
/* lua */
# lua
''
settings = {
['nil'] = {
@@ -53,7 +51,7 @@
# rust-analyzer.enable = true;
};
extraLua.pre =
/* lua */
# lua
''
local lsp_zero = require'lsp-zero'
local lspconfig = require 'lspconfig'
@@ -71,9 +69,7 @@
nvim-dap.enable = true;
todo-comments.enable = true;
lualine = {
enable = true;
};
lualine = { enable = true; };
commentary.enable = true;
surround.enable = true;
which-key.enable = true;
@@ -92,9 +88,7 @@
refactor = {
smartRename = {
enable = true;
keymaps = {
smartRename = "<leader>rn";
};
keymaps = { smartRename = "<leader>rn"; };
};
};
};
@@ -170,7 +164,6 @@
noice-nvim
nvim-web-devicons
];
extraConfigLua = builtins.readFile ./extraConfig.lua;
package = pkgs.neovim-nightly;

9
config/nix/common/tmux.nix
View File

@@ -9,8 +9,7 @@ let
tmux popup -d '#{pane_current_path}' -xC -yC -w$width -h$height -E "tmux attach -t scratch || tmux new -s scratch"
fi
'';
in
{
in {
programs.tmux = {
enable = true;
shell = "${pkgs.nushellFull}/bin/nu";
@@ -28,7 +27,7 @@ in
{
plugin = tmuxPlugins.catppuccin;
extraConfig =
/* tmux */
# tmux
''
set -g @catppuccin_flavour 'mocha'
set -g @catppuccin_window_default_text ''''''
@@ -37,14 +36,14 @@ in
{
plugin = tmuxPlugins.battery;
extraConfig =
/* tmux */
# tmux
''
set -g @catppuccin_status_modules_right "battery application session date_time"
'';
}
];
extraConfig =
/* tmux */
# tmux
''
set -gw mode-keys vi
set -g status-keys vi

2
config/nix/common/wezterm.nix
View File

@@ -1,7 +1,7 @@
{ pkgs, ... }: {
programs.wezterm = {
enable = true;
extraConfig = /* lua */
extraConfig = # lua
''
local wezterm = require 'wezterm';
return {