aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modules/home-manager/firefox.nix88
-rw-r--r--modules/home-manager/init.lua32
-rw-r--r--modules/home-manager/nixcord.nix6
-rw-r--r--modules/home-manager/spicetify.nix15
-rw-r--r--modules/home-manager/sway.nix20
-rw-r--r--modules/home-manager/tmux.nix50
-rw-r--r--modules/home-manager/vscode.nix59
-rw-r--r--modules/home-manager/waybar.nix29
-rw-r--r--modules/home-manager/zathura.nix10
9 files changed, 178 insertions, 131 deletions
diff --git a/modules/home-manager/firefox.nix b/modules/home-manager/firefox.nix
index 7d3dd4d..29ed872 100644
--- a/modules/home-manager/firefox.nix
+++ b/modules/home-manager/firefox.nix
@@ -1,4 +1,10 @@
-{ config, lib, pkgs, inputs, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ inputs,
+ ...
+}:
{
options.firefox.enable = lib.mkEnableOption "Setup firefox";
@@ -35,13 +41,21 @@
search.engines = {
nix-packages = {
name = "Nix Packages";
- urls = [{
- template = "https://search.nixos.org/packages";
- params = [
- { name = "type"; value = "packages"; }
- { name = "query"; value = "{searchTerms}"; }
- ];
- }];
+ urls = [
+ {
+ template = "https://search.nixos.org/packages";
+ params = [
+ {
+ name = "type";
+ value = "packages";
+ }
+ {
+ name = "query";
+ value = "{searchTerms}";
+ }
+ ];
+ }
+ ];
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@np" ];
@@ -49,16 +63,18 @@
nixos-wiki = {
name = "NixOS Wiki";
- urls = [{ template = "https://wiki.nixos.org/w/index.php?search={searchTerms}"; }];
+ urls = [ { template = "https://wiki.nixos.org/w/index.php?search={searchTerms}"; } ];
iconMapObj."16" = "https://wiki.nixos.org/favicon.ico";
definedAliases = [ "@nw" ];
};
startpage = {
name = "Startpage";
- urls = [{
- template = "https://www.startpage.com/sp/search?query={searchTerms}";
- }];
+ urls = [
+ {
+ template = "https://www.startpage.com/sp/search?query={searchTerms}";
+ }
+ ];
icon = "https://www.startpage.com/favicon.ico";
definedAliases = [ "@s" ];
};
@@ -114,14 +130,14 @@
color: var(--foreground) !important;
box-shadow: none !important;;
}
-
+
.tab-background[selected] {
background-color: rgba(0, 0, 0, 0.30) !important;
color: var(--foreground) !important;
box-shadow: none !important;
}
- /* Needed for # transparency in general */
+ /* Needed for transparency in general */
:root {
--tabpanel-background-color: transparent !important;
--chrome-content-separator-color: transparent !important;
@@ -213,7 +229,7 @@
# Hide pip controls
"media.videocontrols.picture-in-picture.video-toggle.enabled" = false;
-
+
# Set homepage
"browser.startup.homepage" = "about:blank";
"browser.newtab.url" = "about:blank";
@@ -222,48 +238,6 @@
# transparency
"browser.tabs.allow_transparent_browser" = true;
"gfx.webrender.all" = true;
-
- # Privacy settings
- "privacy.firstparty.isolate" = true; # Isolate cookies per site
- "privacy.resistFingerprinting" = true;
-
- # Enable HTTPS-Only Mode
- "dom.security.https_only_mode" = true;
- "dom.security.https_only_mode_ever_enabled" = true;
-
- # More Privacy settings
- "privacy.trackingprotection.enabled" = true;
- "privacy.trackingprotection.socialtracking.enabled" = true;
- "privacy.partition.network_state.ocsp_cache" = true;
-
- # Disable all sorts of telemetry
- "browser.newtabpage.activity-stream.feeds.telemetry" = false;
- "browser.newtabpage.activity-stream.telemetry" = false;
- "browser.ping-centre.telemetry" = false;
- "toolkit.telemetry.archive.enabled" = false;
- "toolkit.telemetry.bhrPing.enabled" = false;
- "toolkit.telemetry.enabled" = false;
- "toolkit.telemetry.firstShutdownPing.enabled" = false;
- "toolkit.telemetry.hybridContent.enabled" = false;
- "toolkit.telemetry.newProfilePing.enabled" = false;
- "toolkit.telemetry.reportingpolicy.firstRun" = false;
- "toolkit.telemetry.shutdownPingSender.enabled" = false;
- "toolkit.telemetry.unified" = false;
- "toolkit.telemetry.updatePing.enabled" = false;
-
- # Disable Firefox 'experiments'
- "experiments.activeExperiment" = false;
- "experiments.enabled" = false;
- "experiments.supported" = false;
- "network.allow-experiments" = false;
-
- # Disable Pocket Integration
- "browser.newtabpage.activity-stream.section.highlights.includePocket" = false;
- "extensions.pocket.enabled" = false;
- "extensions.pocket.api" = "";
- "extensions.pocket.oAuthConsumerKey" = "";
- "extensions.pocket.showHome" = false;
- "extensions.pocket.site" = "";
};
};
};
diff --git a/modules/home-manager/init.lua b/modules/home-manager/init.lua
index 132b7e0..ddd4a0d 100644
--- a/modules/home-manager/init.lua
+++ b/modules/home-manager/init.lua
@@ -19,8 +19,10 @@ map({ 'n', 'v', 'x' }, '<leader>y', '"+y', { desc = 'Yank to system clipboard' }
map({ 'n', 'v', 'x' }, '<leader>d', '"+d', { desc = 'Delete to system clipboard' })
vim.pack.add({
- { src = "https://github.com/nyoom-engineering/oxocarbon.nvim" },
+ { src = "https://github.com/ellisonleao/gruvbox.nvim" },
+-- { src = "https://github.com/nyoom-engineering/oxocarbon.nvim" },
{ src = "https://github.com/echasnovski/mini.pick" },
+ { src = "https://github.com/lewis6991/gitsigns.nvim" },
{ src = "https://github.com/nvim-treesitter/nvim-treesitter" },
{ src = "https://github.com/neovim/nvim-lspconfig" },
})
@@ -30,6 +32,13 @@ require("nvim-treesitter.configs").setup({
highlight = { enable = true },
})
+vim.diagnostic.config({
+ virtual_text = {
+ source = "if_many",
+ },
+ underline = true,
+ severity_sort = true,
+})
vim.api.nvim_create_autocmd('LspAttach', {
callback = function(ev)
@@ -41,6 +50,7 @@ vim.api.nvim_create_autocmd('LspAttach', {
})
vim.o.completeopt = "menu,menuone,noselect"
+require("gitsigns").setup()
require("lspconfig").nixd.setup({
settings = {
@@ -68,8 +78,18 @@ vim.keymap.set('n', '<leader>lf', vim.lsp.buf.format)
require("mini.pick").setup()
-vim.cmd("colorscheme oxocarbon")
-vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
-vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
-vim.api.nvim_set_hl(0, "NormalNC", { bg = "none" })
-vim.cmd(":hi StatusLine guibg=NONE")
+vim.cmd("colorscheme gruvbox")
+
+local hl = vim.api.nvim_set_hl
+hl(0, 'Normal', { bg = 'none' })
+hl(0, 'NormalFloat', { bg = 'none' })
+hl(0, 'NormalNC', { bg = 'none' })
+hl(0, 'StatusLine', { bg = 'none' })
+hl(0, 'SignColumn', { bg = 'none' })
+
+-- LSP diagnostics
+hl(0, "DiagnosticError", { bg = "none" })
+hl(0, "DiagnosticSignError", { bg = "none" })
+hl(0, "DiagnosticSignHint", { bg = "none" })
+hl(0, "DiagnosticSignInfo", { bg = "none" })
+hl(0, "DiagnosticSignWarn", { bg = "none" })
diff --git a/modules/home-manager/nixcord.nix b/modules/home-manager/nixcord.nix
index c45566b..26cd39c 100644
--- a/modules/home-manager/nixcord.nix
+++ b/modules/home-manager/nixcord.nix
@@ -1,4 +1,8 @@
-{ config, lib, ... }:
+{
+ config,
+ lib,
+ ...
+}:
{
options.nixcord.enable = lib.mkEnableOption "Enable nixcord and setup";
diff --git a/modules/home-manager/spicetify.nix b/modules/home-manager/spicetify.nix
index 5d245d9..41ccb1e 100644
--- a/modules/home-manager/spicetify.nix
+++ b/modules/home-manager/spicetify.nix
@@ -1,8 +1,15 @@
-{ config, lib, pkgs, inputs, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ inputs,
+ ...
+}:
let
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.system};
-in {
+in
+{
options.spicetify.enable = lib.mkEnableOption "Enable Spicetify integration";
config = lib.mkIf config.spicetify.enable {
programs.spicetify = {
@@ -18,9 +25,9 @@ in {
enabledExtensions = with spicePkgs.extensions; [
keyboardShortcut
];
-
+
theme = spicePkgs.themes.sleek;
colorScheme = "Coral";
};
};
-} \ No newline at end of file
+}
diff --git a/modules/home-manager/sway.nix b/modules/home-manager/sway.nix
index 16043ef..4522e84 100644
--- a/modules/home-manager/sway.nix
+++ b/modules/home-manager/sway.nix
@@ -1,8 +1,14 @@
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
let
mod = config.wayland.windowManager.sway.config.modifier;
-in {
+in
+{
options.sway.enable = lib.mkEnableOption "Enable sway and setup";
config = lib.mkIf config.sway.enable {
home.packages = with pkgs; [
@@ -67,10 +73,12 @@ in {
menu = "${pkgs.wmenu}/bin/wmenu-run -b -N 000000";
terminal = "${pkgs.foot}/bin/foot";
defaultWorkspace = "workspace number 1";
-
- bars = [{
- "command" = "${pkgs.waybar}/bin/waybar";
- }];
+
+ bars = [
+ {
+ "command" = "${pkgs.waybar}/bin/waybar";
+ }
+ ];
};
checkConfig = false;
wrapperFeatures.base = true;
diff --git a/modules/home-manager/tmux.nix b/modules/home-manager/tmux.nix
index 3d61374..cde88e0 100644
--- a/modules/home-manager/tmux.nix
+++ b/modules/home-manager/tmux.nix
@@ -1,4 +1,8 @@
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ ...
+}:
{
options.tmux.enable = lib.mkEnableOption "Enable and configure Tmux";
@@ -6,31 +10,31 @@
programs.tmux = {
enable = true;
extraConfig = ''
- unbind C-b
- set-option -g prefix C-a
- bind-key C-a send-prefix
+ unbind C-b
+ set-option -g prefix C-a
+ bind-key C-a send-prefix
- bind -n M-Left select-pane -L
- bind -n M-Right select-pane -R
- bind -n M-Up select-pane -U
- bind -n M-Down select-pane -D
+ bind -n M-Left select-pane -L
+ bind -n M-Right select-pane -R
+ bind -n M-Up select-pane -U
+ bind -n M-Down select-pane -D
- # style
- set -g status-position top
- set -g status-justify absolute-centre
- set -g status-style 'fg=color7 bg=default'
- set -g status-right ""
- # set -g status-right ' #(cd #{pane_current_path}; git rev-parse --abbrev-ref HEAD)'
- # set -g status-right ""
- set -g status-left '#S'
- set -g status-left-style 'fg=color8'
- set -g status-right-length 0
- set -g status-left-length 100
- setw -g window-status-current-style 'fg=colour6 bg=default bold'
- setw -g window-status-current-format '#I:#W '
- setw -g window-status-style 'fg=color8'
+ # style
+ set -g status-position top
+ set -g status-justify absolute-centre
+ set -g status-style 'fg=color7 bg=default'
+ set -g status-right ""
+ # set -g status-right ' #(cd #{pane_current_path}; git rev-parse --abbrev-ref HEAD)'
+ # set -g status-right ""
+ set -g status-left '#S'
+ set -g status-left-style 'fg=color8'
+ set -g status-right-length 0
+ set -g status-left-length 100
+ setw -g window-status-current-style 'fg=colour6 bg=default bold'
+ setw -g window-status-current-format '#I:#W '
+ setw -g window-status-style 'fg=color8'
- set -g mouse on
+ set -g mouse on
'';
};
};
diff --git a/modules/home-manager/vscode.nix b/modules/home-manager/vscode.nix
index 3dd2541..69d813a 100644
--- a/modules/home-manager/vscode.nix
+++ b/modules/home-manager/vscode.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
{
options.vscode.enable = lib.mkEnableOption "Enable vscode and setup";
@@ -9,42 +14,46 @@
profiles.default = {
enableUpdateCheck = true;
enableExtensionUpdateCheck = true;
-
+
userSettings = {
"update.mode" = "none";
"workbench.colorTheme" = "Minimal";
- "editor.fontFamily" = "'SpaceMono Nerd Font Mono', monospace";
+ "editor.fontFamily" = "monospace";
"editor.tabSize" = 2;
"editor.minimap.enabled" = false;
"terminal.integrated.cursorStyle" = "underline";
"terminal.integrated.cursorStyleInactive" = "underline";
- "terminal.integrated.fontFamily" = "'BlexMono Nerd Font Mono', monospace";
+ "terminal.integrated.fontFamily" = "monospace";
"terminal.integrated.fontSize" = 13;
"git.autofetch" = true;
"window.controlsStyle" = "custom";
};
- extensions = (with pkgs.vscode-extensions; [
- ms-vscode.cmake-tools
- ms-azuretools.vscode-docker
- eamodio.gitlens
- ms-python.python
- golang.go
- rust-lang.rust-analyzer
- vscjava.vscode-maven
- sumneko.lua
- #fwcd.kotlin
- bradlc.vscode-tailwindcss
- adpyke.codesnap
- esbenp.prettier-vscode
- ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
- {
- name = "minimalist-dark";
- publisher = "nichabosh";
- version = "1.0.0";
- sha256 = "sha256-lw+Scfada6DycLdRT2Cz+Fd12JucglIrw3uRd2ZhabQ=";
- }
- ]);
+ extensions = (
+ with pkgs.vscode-extensions;
+ [
+ ms-vscode.cmake-tools
+ ms-azuretools.vscode-docker
+ eamodio.gitlens
+ ms-python.python
+ golang.go
+ rust-lang.rust-analyzer
+ vscjava.vscode-maven
+ sumneko.lua
+ #fwcd.kotlin
+ bradlc.vscode-tailwindcss
+ adpyke.codesnap
+ esbenp.prettier-vscode
+ ]
+ ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+ {
+ name = "minimalist-dark";
+ publisher = "nichabosh";
+ version = "1.0.0";
+ sha256 = "sha256-lw+Scfada6DycLdRT2Cz+Fd12JucglIrw3uRd2ZhabQ=";
+ }
+ ]
+ );
};
};
};
diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix
index a3adb3b..674228f 100644
--- a/modules/home-manager/waybar.nix
+++ b/modules/home-manager/waybar.nix
@@ -1,4 +1,8 @@
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ ...
+}:
{
options.waybar.enable = lib.mkEnableOption "Enable and configure Waybar";
@@ -23,15 +27,24 @@
"clock"
];
- tray = { spacing = 10; };
+ tray = {
+ spacing = 10;
+ };
- privacy = { icon-size = 16; };
+ privacy = {
+ icon-size = 16;
+ };
network = {
format-disconnect = "";
format-ethernet = "";
format-wifi = "{icon} {signalStrength}";
- format-icon = [ "󰤟" "󰤢" "󰤥" "󰤨" ];
+ format-icon = [
+ "󰤟"
+ "󰤢"
+ "󰤥"
+ "󰤨"
+ ];
tooltip-format-wifi = "{essid}";
tooltip-format-ethernet = "{ifname}";
};
@@ -43,7 +56,7 @@
format-connected = " {device_alias}";
tooltip = false;
};
-
+
clock = {
format-alt = "{:%Y-%m-%d}";
tooltip-format = "{:%Y-%m-%d | %H:%M}";
@@ -53,7 +66,11 @@
format = "{icon} {volume}%";
format-bluetooth = "{volume}% {icon}";
format-icons = {
- default = [ "" "" "" ];
+ default = [
+ ""
+ ""
+ ""
+ ];
};
};
};
diff --git a/modules/home-manager/zathura.nix b/modules/home-manager/zathura.nix
index 592119b..c8605d0 100644
--- a/modules/home-manager/zathura.nix
+++ b/modules/home-manager/zathura.nix
@@ -1,4 +1,8 @@
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ ...
+}:
{
options.zathura.enable = lib.mkEnableOption "Enable zathura and setup";
@@ -16,7 +20,7 @@
pages-per-row = 1;
scroll-page-aware = true;
};
-
+
mappings = {
i = "recolor";
j = "navigate previous";
@@ -24,4 +28,4 @@
};
};
};
-} \ No newline at end of file
+}
generated by cgit v1.3.1 (git 2.54.0) at 2026-05-30 18:18:12 +0000