djaidjai/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fmt

Browse Source
This commit is contained in:
Djai Hougee
2026-09-26 02:14:34 +02:00
parent 7a07c37bc3
commit a8365a1a73
17 changed files with 313 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/apps.nix
View File

@@ -9,7 +9,7 @@
enable = true;
onCalendar = "weekly";
};
packages = [
packages = [
"io.freetubeapp.FreeTube"
];
};

2
modules/audio.nix
View File

@@ -1,7 +1,7 @@
{ pkgs, ... }:
{
software.pulseaudio.enable = false;
services.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {

9
modules/base.nix
View File

@@ -30,10 +30,10 @@
isNormalUser = true;
description = "djai";
extraGroups = [
"docker"
"networkmanager"
"video"
"wheel"
"docker"
"networkmanager"
"video"
"wheel"
];
};
@@ -50,7 +50,6 @@
vim
];
# TODO: use home-manager
# home-manager = {
# useGlobalPkgs = true;

2
modules/default.nix
View File

@@ -1,6 +1,6 @@
{
imports = [
../secrets
# ../secrets # TODO: uncomment
./apps.nix
./audio.nix
./base.nix

18
modules/desktop/default.nix
View File

@@ -4,15 +4,15 @@
services.displayManager.sddm.enable = true;
services.displayManager.autoLogin = {
enable = true;
user = djai;
user = "djai";
};
services.xserver = {
enable = true;
videoDrivers = [
nvidia
amdgpu
intel
"nvidia"
"amdgpu"
"intel"
];
xkb = {
layout = "us";
@@ -33,11 +33,11 @@
services.blueman.enable = true;
fonts.packages = with pkgs; [
nerd-fonts.caskaydia-cove
nerd-fonts.fira-code
nerd-fonts.iosevka
nerd-fonts.shure-tech-mono
nerd-fonts.symbols-only
nerd-fonts.caskaydia-cove
nerd-fonts.fira-code
nerd-fonts.iosevka
nerd-fonts.shure-tech-mono
nerd-fonts.symbols-only
];
# services.gvfs.enable = true;

130
modules/dev.nix
View File

@@ -2,6 +2,70 @@
let
system = pkgs.stdenv.hostPlatform.system;
nvchad = inputs.nix4nvchad.packages.${system}.default.override {
extraConfig = ''
local map = vim.keymap.set
local builtin = require('telescope.builtin')
map("n", ";", ":", { desc = "CMD enter command mode" })
map("n", "<leader>sw", "<cmd> set wrap! <CR>", {desc = "Toggle text wrapping"})
map("n", "<leader>fm", function() require("conform").format() end, {desc = "Format with conform"})
map("n", "<leader>-", "<cmd> Oil <CR>", {desc = "Open directory in oil"})
map("n", "<leader>rcu", function() require('crates').upgrade_all_crates() end, {desc = "Upgrade rust crates"})
map("n", "<leader>ca", function() vim.lsp.buf.code_action() end, {desc = "Lsp code action"})
map("n", "<leader>gr", function() vim.lsp.buf.references() end, {desc = "Lsp references"})
map("n", "<leader>gm", "<cmd>Telescope git_commits<CR>", { desc = "telescope git commits" })
map('n', '<leader>fi', function()
builtin.live_grep({
prompt_title = "Files matching TODO",
default_text = "(TODO|todo|FIXME|THOUGHT|REFACTOR|TEST)",
})
end, {desc = "find comments using telescope"})
-- stay in v mode after indenting
map("v", "<", "<gv")
map("v", ">", ">gv")
'';
extraPlugins = ''
return {
{
"neovim/nvim-lspconfig",
config = function()
require "configs.lspconfig"
end,
},{
"rcarriga/nvim-notify",
event = "VeryLazy",
config = function()
local notify = require "notify"
notify.setup {
background_colour = "#2D3540",
}
vim.notify = notify
end,
},{
"stevearc/oil.nvim",
opts = {},
dependencies = { "nvim-tree/nvim-web-devicons"},
lazy = false
},{
'saecki/crates.nvim',
event = { "BufRead Cargo.toml" },
config = function()
require('crates').setup()
end,
},{
"jglasovic/venv-lsp.nvim",
config = function()
require("venv-lsp").setup()
end,
lazy = false,
}
}
'';
};
in
{
programs.java.enable = true;
@@ -37,7 +101,7 @@ in
users.users.djai.packages = with pkgs; [
# dev environment
godot
inputs.nix4nvchad.packages.${system}.nvchad
nvchad
jq
lazygit
ripgrep
@@ -69,68 +133,4 @@ in
# FIXME: use builtins.readfile to store these config options i think
# home-manager.users.djai.home.packages = with pkgs; [];
nvchad = inputs.nix4nvchad.packages.${system}.default.override {
extraConfig = ''
local map = vim.keymap.set
local builtin = require('telescope.builtin')
map("n", ";", ":", { desc = "CMD enter command mode" })
map("n", "<leader>sw", "<cmd> set wrap! <CR>", {desc = "Toggle text wrapping"})
map("n", "<leader>fm", function() require("conform").format() end, {desc = "Format with conform"})
map("n", "<leader>-", "<cmd> Oil <CR>", {desc = "Open directory in oil"})
map("n", "<leader>rcu", function() require('crates').upgrade_all_crates() end, {desc = "Upgrade rust crates"})
map("n", "<leader>ca", function() vim.lsp.buf.code_action() end, {desc = "Lsp code action"})
map("n", "<leader>gr", function() vim.lsp.buf.references() end, {desc = "Lsp references"})
map("n", "<leader>gm", "<cmd>Telescope git_commits<CR>", { desc = "telescope git commits" })
map('n', '<leader>fi', function()
builtin.live_grep({
prompt_title = "Files matching TODO",
default_text = "(TODO|todo|FIXME|THOUGHT|REFACTOR|TEST)",
})
end, {desc = "find comments using telescope"})
-- stay in v mode after indenting
map("v", "<", "<gv")
map("v", ">", ">gv")
'';
extraPlugins = ''
return {
{
"neovim/nvim-lspconfig",
config = function()
require "configs.lspconfig"
end,
},{
"rcarriga/nvim-notify",
event = "VeryLazy",
config = function()
local notify = require "notify"
notify.setup {
background_colour = "#2D3540",
}
vim.notify = notify
end,
},{
"stevearc/oil.nvim",
opts = {},
dependencies = { "nvim-tree/nvim-web-devicons"},
lazy = false
},{
'saecki/crates.nvim',
event = { "BufRead Cargo.toml" },
config = function()
require('crates').setup()
end,
},{
"jglasovic/venv-lsp.nvim",
config = function()
require("venv-lsp").setup()
end,
lazy = false,
}
}
'';
};
}

14
modules/dunst.nix
View File

@@ -18,7 +18,7 @@
corners = "bottom-left, top-right";
ellipsize = "middle";
enable_posix_regex = true;
follow = mouse;
follow = "mouse";
font = "Iosevka Mono Nerd Font Medium 10";
force_xinerama = false;
force_xwayland = false;
@@ -32,7 +32,7 @@
idle_threshold = 120;
ignore_dbusclose = false;
ignore_newline = false;
indicate_hidden = yes;
indicate_hidden = true;
line_height = 0;
markup = "full";
max_icon_size = 32;
@@ -47,19 +47,19 @@
progress_bar_max_width = 400;
progress_bar_min_width = 150;
progress_bar = true;
separator_color = frame;
separator_color = "frame";
separator_height = 2;
show_age_threshold = 60;
show_indicators = true;
shrink = no;
sort = yes;
shrink = false;
sort = true;
stack_duplicates = true;
sticky_history = true;
text_icon_padding = 15;
title = "Dunst";
vertical_alignment = "center";
width = 250;
word_wrap =false;
word_wrap = false;
};
experimental.per_monitor_dpi = false;
@@ -82,7 +82,7 @@
foreground = "#F38BA8";
format = "<b>%s</b>\n%b";
frame_color = "#F38BA8";
timeout = 60 ;
timeout = 60;
};
fcitx5-filter = {

1
modules/email.nix
View File

@@ -1,6 +1,5 @@
{ config, pkgs, ... }:
{
programs.thunderbird.enable = true;
}

2
modules/terminal.nix
View File

@@ -108,7 +108,7 @@
'';
plugins = with pkgs.tmuxPlugins; [
sensible
sensible
resurrect
];
};

3
modules/web/default.nix
View File

@@ -2,7 +2,7 @@
{
# TODO: switch to home manager
# then configure plugins n shi here too
# then configure plugins n shi here too
# make a shared section (about:config sections, plugins, profiles) and then have two separate configs in firefox.nix and librewolf.nix
# https://wiki.nixos.org/wiki/Librewolf
# https://wiki.nixos.org/wiki/Firefox/en
@@ -15,4 +15,3 @@
firefox
];
}

15
modules/web/firefox.nix
View File

@@ -3,7 +3,8 @@
{
programs.firefox = {
enable = true;
preferences = { #TODO: port over all changes in about:config from tuxcomp
preferences = {
# TODO: port over all changes in about:config from tuxcomp
"browser.resistFingerPrinting" = true;
};
@@ -12,26 +13,22 @@
ExtensionSettings = {
"uBlock0@raymondhill.net" = {
installation_mode = "force_installed";
install_url =
"https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
};
"vimium@vimium.org" = {
installation_mode = "force_installed";
install_url =
"https://addons.mozilla.org/firefox/downloads/latest/vimium/latest.xpi";
install_url = "https://addons.mozilla.org/firefox/downloads/latest/vimium/latest.xpi";
};
"addon@darkreader.org" = {
installation_mode = "force_installed";
install_url =
"https://addons.mozilla.org/firefox/downloads/latest/darkreader/latest.xpi";
install_url = "https://addons.mozilla.org/firefox/downloads/latest/darkreader/latest.xpi";
};
"{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
installation_mode = "force_installed";
install_url =
"https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi";
install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi";
};
};
};