From 328c741b1aac74020412e99e0dca7c728dbc92fa Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Mon, 23 Jun 2025 22:33:44 -0400 Subject: refactor --- home/default.nix | 120 +++---- home/git.nix | 19 ++ home/gpg.nix | 31 ++ home/neovim/config.nix | 94 ++++++ home/neovim/default.nix | 74 +++++ home/neovim/init.lua | 359 +++++++++++++++++++++ home/ssh/config | 12 + home/ssh/default.nix | 13 + home/starship.nix | 49 +++ home/tmux/default.nix | 16 + home/tmux/tmux.conf | 105 ++++++ home/tmux/tmux_window | 7 + home/zsh/default.nix | 17 + home/zsh/zprofile | 11 + home/zsh/zshrc | 73 +++++ hosts/shinji/default.nix | 1 - hosts/thinkpad/default.nix | 20 +- modules/default.nix | 9 + modules/desktop/astal.nix | 24 ++ modules/desktop/default.nix | 106 ++++++ modules/desktop/firefox/default.nix | 39 +++ modules/desktop/firefox/extraPrefs.nix | 21 ++ modules/desktop/firefox/policy.nix | 127 ++++++++ modules/desktop/firefox/policyExtensions.nix | 62 ++++ modules/desktop/firefox/policyPrefs.nix | 128 ++++++++ modules/desktop/firefox/userChrome.nix | 23 ++ modules/desktop/hypridle.nix | 45 +++ modules/desktop/hyprland.nix | 353 ++++++++++++++++++++ modules/desktop/hyprlock.nix | 87 +++++ modules/desktop/hyprpaper.nix | 22 ++ modules/desktop/mako.nix | 35 ++ modules/desktop/waybar/default.nix | 87 +++++ modules/desktop/waybar/style.nix | 108 +++++++ modules/desktop/wofi/default.nix | 29 ++ modules/desktop/wofi/style.nix | 74 +++++ modules/development/default.nix | 49 +++ modules/gaming/default.nix | 19 ++ modules/gaming/homestuck.nix | 19 ++ modules/gaming/minecraft.nix | 17 + modules/gaming/steam.nix | 34 ++ modules/terminal/default.nix | 15 + modules/terminal/kitty.nix | 84 +++++ modules/virt/default.nix | 19 ++ modules/virt/docker.nix | 15 + modules/virt/qemu.nix | 20 ++ programs/astal/default.nix | 19 -- programs/default.nix | 21 -- programs/firefox/default.nix | 36 --- programs/firefox/extraPrefs.nix | 21 -- programs/firefox/policy.nix | 127 -------- programs/firefox/policyExtensions.nix | 62 ---- programs/firefox/policyPrefs.nix | 128 -------- programs/firefox/userChrome.nix | 23 -- programs/git/default.nix | 19 -- programs/gpg/default.nix | 39 --- programs/hypr/default.nix | 8 - programs/hypr/hypridle.nix | 40 --- programs/hypr/hyprland.nix | 348 -------------------- programs/hypr/hyprlock.nix | 82 ----- programs/hypr/hyprpaper.nix | 17 - programs/kitty/default.nix | 79 ----- programs/mako/default.nix | 30 -- programs/neovim/config.nix | 94 ------ programs/neovim/default.nix | 74 ----- programs/neovim/init.lua | 359 --------------------- programs/ssh/config | 12 - programs/ssh/default.nix | 45 --- programs/starship/default.nix | 49 --- programs/steam/default.nix | 25 -- programs/talc/default.nix | 15 - programs/tmux/default.nix | 16 - programs/tmux/tmux.conf | 105 ------ programs/tmux/tmux_window | 7 - .../unofficial-homestuck-collection/default.nix | 15 - programs/waybar/default.nix | 82 ----- programs/waybar/style.nix | 108 ------- programs/wofi/default.nix | 24 -- programs/wofi/style.nix | 74 ----- programs/zsh/default.nix | 17 - programs/zsh/zprofile | 11 - programs/zsh/zshrc | 73 ----- system/default.nix | 69 +--- system/hardware.nix | 9 + system/sshd.nix | 33 ++ 84 files changed, 2666 insertions(+), 2440 deletions(-) create mode 100644 home/git.nix create mode 100644 home/gpg.nix create mode 100644 home/neovim/config.nix create mode 100644 home/neovim/default.nix create mode 100644 home/neovim/init.lua create mode 100644 home/ssh/config create mode 100644 home/ssh/default.nix create mode 100644 home/starship.nix create mode 100644 home/tmux/default.nix create mode 100644 home/tmux/tmux.conf create mode 100755 home/tmux/tmux_window create mode 100644 home/zsh/default.nix create mode 100644 home/zsh/zprofile create mode 100644 home/zsh/zshrc create mode 100644 modules/default.nix create mode 100644 modules/desktop/astal.nix create mode 100644 modules/desktop/default.nix create mode 100644 modules/desktop/firefox/default.nix create mode 100644 modules/desktop/firefox/extraPrefs.nix create mode 100644 modules/desktop/firefox/policy.nix create mode 100644 modules/desktop/firefox/policyExtensions.nix create mode 100644 modules/desktop/firefox/policyPrefs.nix create mode 100644 modules/desktop/firefox/userChrome.nix create mode 100644 modules/desktop/hypridle.nix create mode 100644 modules/desktop/hyprland.nix create mode 100644 modules/desktop/hyprlock.nix create mode 100644 modules/desktop/hyprpaper.nix create mode 100644 modules/desktop/mako.nix create mode 100644 modules/desktop/waybar/default.nix create mode 100644 modules/desktop/waybar/style.nix create mode 100644 modules/desktop/wofi/default.nix create mode 100644 modules/desktop/wofi/style.nix create mode 100644 modules/development/default.nix create mode 100644 modules/gaming/default.nix create mode 100644 modules/gaming/homestuck.nix create mode 100644 modules/gaming/minecraft.nix create mode 100644 modules/gaming/steam.nix create mode 100644 modules/terminal/default.nix create mode 100644 modules/terminal/kitty.nix create mode 100644 modules/virt/default.nix create mode 100644 modules/virt/docker.nix create mode 100644 modules/virt/qemu.nix delete mode 100644 programs/astal/default.nix delete mode 100644 programs/default.nix delete mode 100644 programs/firefox/default.nix delete mode 100644 programs/firefox/extraPrefs.nix delete mode 100644 programs/firefox/policy.nix delete mode 100644 programs/firefox/policyExtensions.nix delete mode 100644 programs/firefox/policyPrefs.nix delete mode 100644 programs/firefox/userChrome.nix delete mode 100644 programs/git/default.nix delete mode 100644 programs/gpg/default.nix delete mode 100644 programs/hypr/default.nix delete mode 100644 programs/hypr/hypridle.nix delete mode 100644 programs/hypr/hyprland.nix delete mode 100644 programs/hypr/hyprlock.nix delete mode 100644 programs/hypr/hyprpaper.nix delete mode 100644 programs/kitty/default.nix delete mode 100644 programs/mako/default.nix delete mode 100644 programs/neovim/config.nix delete mode 100644 programs/neovim/default.nix delete mode 100644 programs/neovim/init.lua delete mode 100644 programs/ssh/config delete mode 100644 programs/ssh/default.nix delete mode 100644 programs/starship/default.nix delete mode 100644 programs/steam/default.nix delete mode 100644 programs/talc/default.nix delete mode 100644 programs/tmux/default.nix delete mode 100644 programs/tmux/tmux.conf delete mode 100755 programs/tmux/tmux_window delete mode 100644 programs/unofficial-homestuck-collection/default.nix delete mode 100644 programs/waybar/default.nix delete mode 100644 programs/waybar/style.nix delete mode 100644 programs/wofi/default.nix delete mode 100644 programs/wofi/style.nix delete mode 100644 programs/zsh/default.nix delete mode 100644 programs/zsh/zprofile delete mode 100644 programs/zsh/zshrc create mode 100644 system/hardware.nix create mode 100644 system/sshd.nix diff --git a/home/default.nix b/home/default.nix index 8561236..4cdc894 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,11 +1,22 @@ { + lib, config, pkgs, inputs, ... -}: { +}: let + inherit (lib) optionals; + system = pkgs.stdenv.hostPlatform.system; +in { imports = [ inputs.home-manager.nixosModules.home-manager + ./neovim + ./ssh + ./tmux + ./zsh + ./git.nix + ./gpg.nix + ./starship.nix ]; home-manager.users.${config.user} = { @@ -15,76 +26,43 @@ news.display = "silent"; fonts.fontconfig.enable = true; - home.packages = with pkgs; [ - # nix - home-manager - # c / c++ - clang-tools - gcc - gdb - gnumake - nasm - pkg-config - # rust - rustc - rustfmt - rust-analyzer - cargo - clippy - # zig - zig - zls - # java/kotlin - gradle - jdk - jdt-language-server - kotlin - kotlin-language-server - maven - # gtk - adwaita-icon-theme - orchis-theme - # media - ffmpeg - libaacs - libavif - libbluray - libjxl - # wayland - cage - grimblast - wl-clipboard - wl-clip-persist - wl-mirror - # gaming - prismlauncher - # social - discord - element-desktop - gajim - # programs - blueman - brightnessctl - easyeffects - fd - filezilla - gimp - imagemagick - imv - jq - libnotify - mpv - pavucontrol - pfetch-rs - rsync - sassc - sl - starship - thunderbird-latest - vlc - yt-dlp - zathura - ]; + home.packages = + (with pkgs; [ + # nix + home-manager + # programs + fd + imagemagick + jq + pfetch-rs + rsync + sassc + sl + starship + yt-dlp + ]) + ++ [ + inputs.talc.packages.${system}.talc + ] + ++ (with pkgs; + optionals config.desktop.enable [ + # social + discord + element-desktop + gajim + thunderbird-latest + # programs + blueman + brightnessctl + easyeffects + filezilla + gimp + imv + mpv + pavucontrol + vlc + zathura + ]); xdg.configFile = { "aacs/keydb.cfg" = { diff --git a/home/git.nix b/home/git.nix new file mode 100644 index 0000000..5c6a73a --- /dev/null +++ b/home/git.nix @@ -0,0 +1,19 @@ +{config, ...}: { + home-manager.users.${config.user} = { + programs.git = { + enable = true; + userName = config.fullName; + userEmail = config.email; + + signing = { + format = "openpgp"; + key = "D9AF0A4209B7C2DE11A884BFACBC553660D9993D"; + signByDefault = true; + }; + + extraConfig = { + init.defaultBranch = "main"; + }; + }; + }; +} diff --git a/home/gpg.nix b/home/gpg.nix new file mode 100644 index 0000000..a2deed2 --- /dev/null +++ b/home/gpg.nix @@ -0,0 +1,31 @@ +{ + config, + lib, + pkgs, + ... +}: let + keysDir = ../files/keys; + keys = lib.attrsets.mapAttrsToList (name: type: "${keysDir}/${name}") (builtins.readDir keysDir); + gpgKeys = builtins.filter (path: lib.strings.hasSuffix "asc" path) keys; +in { + home-manager.users.${config.user} = { + # install keys into gpg keyring + programs.gpg = { + enable = true; + publicKeys = + map (path: { + source = path; + trust = 5; + }) + gpgKeys; + }; + + # global gpg agent + services.gpg-agent = { + enable = true; + enableExtraSocket = true; + enableSshSupport = true; + pinentry.package = pkgs.pinentry-curses; + }; + }; +} diff --git a/home/neovim/config.nix b/home/neovim/config.nix new file mode 100644 index 0000000..ae10243 --- /dev/null +++ b/home/neovim/config.nix @@ -0,0 +1,94 @@ +{ + config, + inputs, +}: +inputs.self.lib.lua.fmt { + # Width of tabs in the editor + tabwidth = 4; + # If tabs should be expanded to spaces + expandtab = false; + keys = { + # NeoVIM leader key + leader = " "; + # Keybind to remove active hilighted content + noh = "h"; + menus = { + # Open file browser + browser = "e"; + # Show active buffers + buffers = "fb"; + # Show LSP errors + error = "t"; + # Find files in working directory + find = "ff"; + # Grep files in working directory + grep = "fg"; + # Search help menu + help = "fh"; + # Voew undo tree + undo = "u"; + }; + lsp = { + # Open LSP hover menu on a value + hover = "K"; + # Perform an LSP action on a value + action = "la"; + # View all references of a value + references = "lr"; + # Rename current and all references of a value + rename = "ln"; + }; + cmp = { + # Select previous value in completion engine + prev = ""; + # Select next value in completion engine + next = ""; + # Confirm current value in completion engine + confirm = ""; + # Auto complete using completion engine + complete = ""; + }; + }; + # list of lsp servers to load + lsps = { + clangd = {}; + jdtls = {}; + kotlin_language_server = {}; + phpactor = {}; + rust_analyzer = {}; + ts_ls = {}; + zls = {}; + }; + highlight = { + # max file size in KiB to attempt to parse + max_size = 1024; + }; + # colorscheme + theme = { + colors = { + base00 = "#${config.theme.colors.bg}"; + base01 = "#${config.theme.colors.surface.bg}"; + base02 = "#${config.theme.colors.surface.bg}"; + base03 = "#${config.theme.colors.bright.white}"; + base04 = "#${config.theme.colors.bright.black}"; + base05 = "#${config.theme.colors.fg}"; + base06 = "#${config.theme.colors.bright.white}"; + base07 = "#${config.theme.colors.hover.bg}"; + base08 = "#${config.theme.colors.bright.red}"; + base09 = "#${config.theme.colors.bright.yellow}"; + base0A = "#${config.theme.colors.bright.yellow}"; + base0B = "#${config.theme.colors.bright.green}"; + base0C = "#${config.theme.colors.bright.cyan}"; + base0D = "#${config.theme.colors.bright.blue}"; + base0E = "#${config.theme.colors.bright.magenta}"; + base0F = "#${config.theme.colors.normal.yellow}"; + }; + transparent = true; + }; + # max column width + col = { + # show a bar at `width` characters + show = true; + width = 80; + }; +} diff --git a/home/neovim/default.nix b/home/neovim/default.nix new file mode 100644 index 0000000..c1ed000 --- /dev/null +++ b/home/neovim/default.nix @@ -0,0 +1,74 @@ +{ + inputs, + config, + lib, + pkgs, + ... +}: let + lua_cfg = import ./config.nix {inherit config inputs;}; + lua = builtins.readFile ./init.lua; +in { + environment.variables.EDITOR = "nvim"; + + home-manager.users.${config.user} = { + programs.neovim = { + enable = true; + viAlias = true; + vimAlias = true; + + extraLuaConfig = '' + local config = ${lua_cfg} + + ${lua} + ''; + + plugins = with pkgs.vimPlugins; [ + # Dependencies + vim-devicons + nvim-web-devicons + plenary-nvim + # Colorscheme + base16-nvim + # Mode line + lualine-nvim + # Buffer line + bufferline-nvim + # File browser + nvim-tree-lua + # Undo tree + undotree + # Trouble (error menu) + trouble-nvim + # Telescope (buffers/find/grep/help) + telescope-nvim + # Snippets + vim-vsnip + vim-vsnip-integ + friendly-snippets + # Completion + cmp-buffer + cmp-nvim-lsp + cmp-vsnip + nvim-cmp + # Sourround delimiters + nvim-surround + # Comment functions + nerdcommenter + # Treesitter + nvim-treesitter.withAllGrammars + # Syntax hilighting + vim-illuminate + # Todo comments + todo-comments-nvim + # Lsp server + nvim-lspconfig + # Notifications + fidget-nvim + # Auto indentation + indent-o-matic + # 80 column width + virt-column-nvim + ]; + }; + }; +} diff --git a/home/neovim/init.lua b/home/neovim/init.lua new file mode 100644 index 0000000..2be7fee --- /dev/null +++ b/home/neovim/init.lua @@ -0,0 +1,359 @@ +--[[ + + NeoVIM Configuration + Copyright (c) Freya Murphy 2025 + +]]-- + +--[[ LIB ]]-- + +local function bind(key, action, opts) + opts = opts or {} + vim.keymap.set('n', key, action, opts) +end + +local function join(left, right) + if not left then return right end + if not right then return left end + for k,v in pairs(right) do + local lv, rv = left[k], right[k] + if type(rv) == "table" then + left[k] = join(lv, rv) + else + left[k] = rv + end + end + return left +end + +--[[ VIM ]]-- + +vim.opt.tabstop = config.tabwidth +vim.opt.softtabstop = config.tabwidth +vim.opt.shiftwidth = config.tabwidth +vim.opt.expandtab = config.expandtab +vim.opt.mouse = "a" +vim.opt.clipboard = "unnamedplus" +vim.opt.hlsearch = true +vim.opt.autoindent = true +vim.opt.ttyfast = true +vim.opt.number = true +vim.opt.relativenumber = true +vim.opt.rnu = true +vim.opt.swapfile = false +vim.opt.fillchars = { eob = " "} + + +--[[ BUF ]]-- + +-- remove trailing whitespace on save +vim.api.nvim_create_autocmd({ "BufWritePre" }, { + pattern = { "*" }, + command = [[%s/\s\+$//e]], +}) + +--[[ KEYBINDS ]]-- + +-- leader +vim.g.mapleader = config.keys.leader +vim.g.maplocalleader = config.keys.leader +vim.keymap.set("", '', '', { noremap = true, silent = true }) + +-- lsp +bind(config.keys.noh, vim.cmd.noh) +vim.api.nvim_create_autocmd('LspAttach', { + desc = 'LSP actions', + callback = function(event) + local opts = {buffer = event.buf} + bind(config.keys.lsp.hover, function() vim.lsp.buf.hover() end, opts) + bind(config.keys.lsp.action, function() vim.lsp.buf.code_action() end, opts) + bind(config.keys.lsp.references, function() vim.lsp.buf.references() end, opts) + bind(config.keys.lsp.rename, function() vim.lsp.buf.rename() end, opts) + end +}) + +--[[ COLORSCHEME ]]-- + +vim.opt.termguicolors = true +if config.theme.transparent then + vim.g.base16_transparent_background = 1 +end + +local colorscheme = require('base16-colorscheme') +colorscheme.setup({ + base00 = config.theme.colors.base00, + base01 = config.theme.colors.base01, + base02 = config.theme.colors.base02, + base03 = config.theme.colors.base03, + base04 = config.theme.colors.base04, + base05 = config.theme.colors.base05, + base06 = config.theme.colors.base06, + base07 = config.theme.colors.base07, + base08 = config.theme.colors.base08, + base09 = config.theme.colors.base09, + base0A = config.theme.colors.base0A, + base0B = config.theme.colors.base0B, + base0C = config.theme.colors.base0C, + base0D = config.theme.colors.base0D, + base0E = config.theme.colors.base0E, + base0F = config.theme.colors.base0F, +}) + +-- make transparent background +if config.theme.transparent then + local colors = { + -- Text + "Normal", "NormalNC", "NormalFloat", + -- Line Numbers + "LineNr", "EndOfBuffer", "SignColumn", + -- Floating + "FloatBorder", + -- Mode/Buffer Lines + "TabLine", "TabLineFill", "StatusLine", + } + for _,color in pairs(colors) do + vim.api.nvim_set_hl(0, color, { bg = "none" }) + end +end +-- identifiers should not be colored +vim.api.nvim_set_hl(0, "Identifier", { fg = config.theme.colors.base05 }) +vim.api.nvim_set_hl(0, "TSVariable", { fg = config.theme.colors.base05 }) +-- macro should be colored as a keyword +vim.api.nvim_set_hl(0, "TSFuncMacro", { fg = config.theme.colors.base0E }) +-- comments are too dark +vim.api.nvim_set_hl(0, "Comment", { fg = config.theme.colors.base07 }) +vim.api.nvim_set_hl(0, "@comment", { link = "Comment" }) + +--[[ MODE LINE ]]-- + +local lualine_theme = require('lualine.themes.base16') +if config.theme.transparent then + lualine_theme.normal.c = { fg = config.theme.colors.base05, bg = "none" } +end + +require('lualine').setup { + options = { + theme = lualine_theme, + icons_enabled = true, + globalstatus = true, + }, +} + +--[[ BUFFER LINE ]]-- + +require('bufferline').setup {} + +--[[ FILE BROWSER ]]-- + +vim.g.loaded_netrw = 1 +vim.g.loaded_netrwPlugin = 1 + +require('nvim-tree').setup { + sort = { + sorter = "case_sensitive", + }, + view = { + centralize_selection = true, + signcolumn = "yes", + float = { + enable = true, + quit_on_focus_loss = true, + open_win_config = { + relative = "editor", + border = "rounded", + width = 80, + height = 30, + row = 1, + col = 1, + }, + } + }, + renderer = { + group_empty = true, + }, + actions = { + use_system_clipboard = true, + change_dir = { + enable = true, + global = false, + restrict_above_cwd = false, + }, + expand_all = { + max_folder_discovery = 300, + exclude = {}, + }, + file_popup = { + open_win_config = { + col = 1, + row = 1, + relative = "cursor", + border = "shadow", + style = "minimal", + }, + }, + open_file = { + quit_on_open = true, + window_picker = { + enable = false, + picker = "default", + chars = "abcdefghijklmnopqrstuvwxyz1234567890", + exclude = { + filetype = { "notify", "lazy", "qf", "diff", "fugitive", "fugitiveblame" }, + buftype = { "nofile", "terminal", "help" }, + }, + }, + }, + remove_file = { + close_window = true, + }, + }, + filters = { + dotfiles = false, + }, + tab = { + sync = { + open = false, + close = false, + ignore = {}, + }, + }, + git = { + enable = false, + }, + update_cwd = true, + respect_buf_cwd = true, + update_focused_file = { + enable = true, + update_cwd = true + }, +} + +bind(config.keys.menus.browser, vim.cmd.NvimTreeToggle) + +--[[ UNDO TREE ]]-- + +bind(config.keys.menus.undo, vim.cmd.UndotreeToggle) + +--[[ ERROR MENU ]]-- + +bind(config.keys.menus.error, function() require('trouble').toggle() end) + +--[[ TELESCOPE ]]-- + +local telescope = require('telescope.builtin') +bind(config.keys.menus.buffers, telescope.buffers) +bind(config.keys.menus.find, telescope.find_files) +bind(config.keys.menus.grep, telescope.live_grep) +bind(config.keys.menus.help, telescope.help_tags) +if config.theme.transparent then + vim.api.nvim_set_hl(0, 'TelescopeNormal', { bg = "none" }) + vim.api.nvim_set_hl(0, 'TelescopeBorder', { bg = "none" }) + vim.api.nvim_set_hl(0, 'TelescopeResultsTitle', { bg = "none" }) + vim.api.nvim_set_hl(0, 'TelescopePromptTitle', { bg = "none" }) + vim.api.nvim_set_hl(0, 'TelescopePreviewTitle', { bg = "none" }) + vim.api.nvim_set_hl(0, 'TelescopePromptNormal', { bg = "none" }) + vim.api.nvim_set_hl(0, 'TelescopePromptBorder', { bg = "none" }) +end + +--[[ COMPLETION ]]-- + +local cmp = require('cmp') +local cmp_select = {behavior = cmp.SelectBehavior.select} +local cmp_mappings = cmp.mapping.preset.insert({ + [config.keys.cmp.prev] = cmp.mapping.select_prev_item(cmp_select), + [config.keys.cmp.next] = cmp.mapping.select_next_item(cmp_select), + [config.keys.cmp.confirm] = cmp.mapping.confirm({ select = true }), + [config.keys.cmp.complete] = cmp.mapping.complete(), +}) + +cmp_mappings[''] = nil +cmp_mappings[''] = nil + +cmp.setup { + snippet = { + expand = function(args) + vim.fn["vsnip#anonymous"](args.body) + end, + }, + sources = cmp.config.sources { + { name = 'nvim_lsp' }, + { name = 'vsnip' }, + { name = 'buffer' }, + }, + mapping = cmp_mappings, +} + +--[[ Surround Delimiters ]]-- + +require('nvim-surround').setup {} + +--[[ SYNTAX HIGHLIGHTING ]]-- + +require('nvim-treesitter.configs').setup { + highlight = { + enable = true, + disable = function(lang, buf) + local max_filesize = config.highlight.max_size * 1024 + local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf)) + if ok and stats and stats.size > max_filesize then + return true + end + end, + additional_vim_regex_highlighting = true, + }, +} + +require('illuminate').configure { + providers = { + 'lsp', + 'treesitter', + 'regex', + }, +} + +--[[ TODO COMMENTS ]]-- + +require('todo-comments').setup() + +--[[ LSP SERVER ]]-- + +local lspconfig = require('lspconfig') +local capabilities = require('cmp_nvim_lsp').default_capabilities() + +for lsp,config in pairs(config.lsps) do + local config = join(capabilities, config) + lspconfig[lsp].setup { + capabilities = config, + } +end + +vim.diagnostic.config({ + virtual_lines = true, +}) + +--[[ NOTIFICATIONS ]]-- + +require('fidget').setup { + notification = { + window = { + winblend = 0, + }, + }, +} + +--[[ AUTO INDENTATION ]]-- + +require('indent-o-matic').setup { + max_lines = 2048, + standard_widths = { 2, 4, 8 }, + skip_multiline = true, +} + +--[[ 80 COLUMN WIDTH ]]-- + +if config.col.show then + require('virt-column').setup { + enabled = true, + virtcolumn = tostring(config.col.width), + } +end diff --git a/home/ssh/config b/home/ssh/config new file mode 100644 index 0000000..5ae97b6 --- /dev/null +++ b/home/ssh/config @@ -0,0 +1,12 @@ +Match Host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye" + +Host *.in.freya.cat cid.freya.cat alivemc.net + User root + +Host *.cs.rit.edu + User tam2214 + +Host * + HostkeyAlgorithms +ssh-rsa + PubkeyAcceptedKeyTypes +ssh-rsa + KexAlgorithms -sntrup761x25519-sha512@openssh.com diff --git a/home/ssh/default.nix b/home/ssh/default.nix new file mode 100644 index 0000000..b34e23f --- /dev/null +++ b/home/ssh/default.nix @@ -0,0 +1,13 @@ +{ + config, + lib, + ... +}: { + # ssh config + home-manager.users.${config.user} = { + programs.ssh = { + enable = true; + extraConfig = lib.fileContents ./config; + }; + }; +} diff --git a/home/starship.nix b/home/starship.nix new file mode 100644 index 0000000..74fd28a --- /dev/null +++ b/home/starship.nix @@ -0,0 +1,49 @@ +{ + config, + lib, + ... +}: { + home-manager.users.${config.user} = { + programs.starship = { + enable = true; + + settings = { + format = lib.concatStrings [ + "╭─ " + "$username" + "$hostname" + "$git_branch" + "$directory" + "$line_break" + "╰─ " + ]; + + username = { + style_user = "bold cyan"; + style_root = "bold red"; + format = "[$user]($style) "; + disabled = false; + show_always = true; + }; + + hostname = { + ssh_only = false; + format = "on [$hostname](bold blue) "; + disabled = false; + }; + + directory = { + format = "[$path]($style)[$read_only]($read_only_style) "; + truncation_length = -1; + truncate_to_repo = false; + truncation_symbol = "…/"; + }; + + git_branch = { + style = "bold purple"; + format = "at [$symbol$branch(:$remote_branch)]($style) "; + }; + }; + }; + }; +} diff --git a/home/tmux/default.nix b/home/tmux/default.nix new file mode 100644 index 0000000..c7ce7db --- /dev/null +++ b/home/tmux/default.nix @@ -0,0 +1,16 @@ +{ + config, + pkgs, + ... +}: { + home-manager.users.${config.user} = { + home.packages = [ + pkgs.tmux + ]; + + home.file = { + ".tmux.conf".source = ./tmux.conf; + ".local/bin/tmux_window".source = ./tmux_window; + }; + }; +} diff --git a/home/tmux/tmux.conf b/home/tmux/tmux.conf new file mode 100644 index 0000000..31ac742 --- /dev/null +++ b/home/tmux/tmux.conf @@ -0,0 +1,105 @@ + +# change prefix +set -g prefix C-a +unbind C-b +bind C-a send-prefix + +# split windows like vim +# vim's definition of a horizontal/vertical split is reversed from tmux's +bind s split-window -v +bind v split-window -h + +# split panes using | and - +bind - split-window -v +bind | split-window -h +unbind '"' +unbind % + +# reload config file +bind r source-file ~/.tmux.conf + +# large history +set -g history-limit 10000 + +# start windows and panes at 1, not 0 +set -g base-index 1 +setw -g pane-base-index 1 + +# switch term +bind 1 run-shell "tmux_window 1" +bind 2 run-shell "tmux_window 2" +bind 3 run-shell "tmux_window 3" +bind 4 run-shell "tmux_window 4" +bind 5 run-shell "tmux_window 5" +bind 6 run-shell "tmux_window 6" +bind 7 run-shell "tmux_window 7" +bind 8 run-shell "tmux_window 8" +bind 9 run-shell "tmux_window 9" +bind 0 run-shell "tmux_window 10" +bind S choose-tree + +# terminal style +set -g default-terminal "tmux-256color" +set -g terminal-overrides "*:colors=256" +set -a terminal-features "xterm-kitty:RGB" + +# focus events +set -g focus-events on + +# move around panes with hjkl, as one would in vim after pressing ctrl-w +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 + +# enable mouse control +set -g mouse on + +# don't rename windows automatically +set-option -g allow-rename off + +# don't do anything when a 'bell' rings +set -g visual-activity off +set -g visual-bell off +set -g visual-silence off +setw -g monitor-activity off +set -g bell-action none + +# clock mode +setw -g clock-mode-colour yellow + +# copy mode +setw -g mode-style 'fg=black bg=red bold' +setw -g mode-keys vi + +# panes +set -g pane-border-style 'fg=red' +set -g pane-active-border-style 'fg=yellow' + +# statusbar +set -g status-position bottom +set -g status-justify left +set -g status-style 'fg=blue' +set -g status-interval 1 + +set -g status-left '' +set -g status-left-length 10 + +set -g status-right-style 'fg=black bg=blue' +set -g status-right '%Y-%m-%d %H:%M:%S ' +set -g status-right-length 50 + +setw -g window-status-current-style 'fg=black bg=blue' +setw -g window-status-current-format ' #I #W #F ' + +setw -g window-status-style 'fg=blue bg=black' +setw -g window-status-format ' #I #[fg=white]#W #[fg=blue]#F ' + +setw -g window-status-bell-style 'fg=blue bg=red bold' + +# messages +set -g message-style 'fg=yellow bg=red bold' + +# bind : to command-prompt like vim +# this is the default in tmux already +bind : command-prompt diff --git a/home/tmux/tmux_window b/home/tmux/tmux_window new file mode 100755 index 0000000..1cdacf0 --- /dev/null +++ b/home/tmux/tmux_window @@ -0,0 +1,7 @@ +#!/bin/sh + +if tmux list-windows | grep -q "^$1:"; then + tmux select-window -t "$1" +else + tmux new-window -t "$1" +fi diff --git a/home/zsh/default.nix b/home/zsh/default.nix new file mode 100644 index 0000000..ce1820e --- /dev/null +++ b/home/zsh/default.nix @@ -0,0 +1,17 @@ +{config, ...}: { + programs.zsh = { + enable = true; + enableCompletion = true; + enableGlobalCompInit = false; + autosuggestions.enable = true; + syntaxHighlighting.enable = true; + histSize = 10000; + }; + + home-manager.users.${config.user} = { + home.file = { + ".zshrc".source = ./zshrc; + ".zprofile".source = ./zprofile; + }; + }; +} diff --git a/home/zsh/zprofile b/home/zsh/zprofile new file mode 100644 index 0000000..4815b36 --- /dev/null +++ b/home/zsh/zprofile @@ -0,0 +1,11 @@ +# dont attempt to launch a graphical +# env in tmux +if [ -n "$TMUX" ]; then + return +fi + +# only launch hyprland on tty 1 +if [ -z "${WAYLAND_DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then + export XDG_CURRENT_DESKTOP=Hyprland + exec dbus-run-session Hyprland +fi diff --git a/home/zsh/zshrc b/home/zsh/zshrc new file mode 100644 index 0000000..b1c61a2 --- /dev/null +++ b/home/zsh/zshrc @@ -0,0 +1,73 @@ +# zsh initalization file + +# export 'SHELL' to child processes +export SHELL + +if [[ $- != *i* ]] +then + # We are being invoked from a non-interactive shell. If this + # is an SSH session (as in "ssh host command"), source + # /etc/profile so we get PATH and other essential variables. + [[ -n "$SSH_CLIENT" ]] && source /etc/profile + + # Don't do anything else. + return +fi + +# update PATH +PATH=$PATH:$HOME/.local/bin +PATH=$PATH:$HOME/.cargo/bin + +# vim mode >:) +# no ryan i am not copying you +set -o vi +set show-mode-in-prompt on + +# Set shell prompt using starship +if command -v "starship" > /dev/null; then + eval "$(starship init zsh)" +else + export PS1="$$USER: " +fi + +# aliases +alias rf="rm -fr" # remove le french hon hon hon +alias ls="ls --color=auto" +alias ip="ip --color=auto" +alias grep="grep --color=auto" +alias diff="diff --color=auto" +alias vim="nvim" +alias ssh='TERM=xterm-256color ssh' # xterm-kitty bad + +# nix rebuild +alias rs="sudo nixos-rebuild switch --flake ~/.config/nix#$(hostname)" +alias rh="home-manager switch --flake ~/.config/nix#$(hostname)" + +# manpages +export LESS_TERMCAP_md=$'\e[1;36m' +export LESS_TERMCAP_me=$'\e[0m' +export LESS_TERMCAP_se=$'\e[0m' +export LESS_TERMCAP_so=$'\e[1;92m' +export LESS_TERMCAP_ue=$'\e[0m' +export LESS_TERMCAP_us=$'\e[1;35m' +export GROFF_NO_SGR=1 + +# compinit +autoload compinit && compinit + +# keybinds +bindkey "\e[1;5D" backward-word +bindkey "\e[1;5C" forward-word +bindkey "\e[3;5~" kill-word +bindkey "\C-_" backward-kill-word +bindkey "\e[3~" delete-char +bindkey "\e[H" beginning-of-line +bindkey "\e[F" end-of-line +bindkey "\e\d" undo + +# gpg +export GPG_TTY=$(tty) +export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) + +# ricing +pfetch diff --git a/hosts/shinji/default.nix b/hosts/shinji/default.nix index 9190dc5..92312b8 100644 --- a/hosts/shinji/default.nix +++ b/hosts/shinji/default.nix @@ -49,7 +49,6 @@ inputs.nixpkgs.lib.nixosSystem rec { foliate jami qbittorrent - qemu ]; } ]; diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix index 6c7a15e..e71a441 100644 --- a/hosts/thinkpad/default.nix +++ b/hosts/thinkpad/default.nix @@ -12,7 +12,7 @@ inputs.nixpkgs.lib.nixosSystem rec { options ../../config ../../home - ../../programs + ../../modules ../../system { imports = [ @@ -27,6 +27,24 @@ inputs.nixpkgs.lib.nixosSystem rec { scale = 1.0; } ]; + + # modules + desktop = { + enable = true; + astal = true; + firefox = true; + hyprland = true; + hyprlock = true; + hypridle = true; + hyprpaper = true; + }; + gaming = { + homestuck = true; + minecraft = true; + }; + terminal = { + kitty = true; + }; } ]; } diff --git a/modules/default.nix b/modules/default.nix new file mode 100644 index 0000000..f478f50 --- /dev/null +++ b/modules/default.nix @@ -0,0 +1,9 @@ +{...}: { + imports = [ + ./desktop + ./development + ./gaming + ./terminal + ./virt + ]; +} diff --git a/modules/desktop/astal.nix b/modules/desktop/astal.nix new file mode 100644 index 0000000..2f7f0f3 --- /dev/null +++ b/modules/desktop/astal.nix @@ -0,0 +1,24 @@ +{ + lib, + config, + pkgs, + inputs, + ... +}: let + system = pkgs.stdenv.hostPlatform.system; + astal = inputs.self.packages.${system}; + + inherit (lib) mkIf; + cfg = config.desktop; +in { + config = mkIf cfg.astal { + default.appLauncher = lib.mkDefault "astal-launcher"; + + home-manager.users.${config.user} = { + home.packages = [ + astal.astal.shell + astal.astal.launcher + ]; + }; + }; +} diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix new file mode 100644 index 0000000..a11842c --- /dev/null +++ b/modules/desktop/default.nix @@ -0,0 +1,106 @@ +{ + lib, + config, + pkgs, + ... +}: let + inherit (lib) mkEnableOption mkIf optionals; + cfg = config.desktop; +in { + imports = [ + ./firefox + ./waybar + ./wofi + ./astal.nix + ./hypridle.nix + ./hyprland.nix + ./hyprlock.nix + ./hyprpaper.nix + ./mako.nix + ]; + + options.desktop = { + enable = mkEnableOption "Enable baseline desktop utils and programs."; + astal = mkEnableOption "Enable the astal gtk shell."; + firefox = mkEnableOption "Enable the firefox browser."; + hypridle = mkEnableOption "Enable the hypridle daemon."; + hyprland = mkEnableOption "Install the Hyprland desktop."; + hyprlock = mkEnableOption "Enable the hyprlock lockscreen."; + hyprpaper = mkEnableOption "Enable the hyprpaper wallpaper daemon."; + mako = mkEnableOption "Enable the mako notification daemon."; + waybar = mkEnableOption "Enable the waybar bar."; + wofi = mkEnableOption "Enable the wofi launcher."; + }; + + config = mkIf cfg.enable { + home-manager.users.${config.user} = { + # desktop specific programs + home.packages = with pkgs; [ + # gtk + adwaita-icon-theme + orchis-theme + # media + ffmpeg + libaacs + libavif + libbluray + libjxl + # wayland + cage + grimblast + wl-clipboard + wl-clip-persist + wl-mirror + # xdg + libnotify + ]; + + # desktop only fonts + fonts.packages = + (with pkgs; [ + corefonts + dejavu_fonts + fira-code + fira-code-symbols + jetbrains-mono + material-icons + nerd-fonts.fira-code + noto-fonts + noto-fonts-cjk-sans + noto-fonts-emoji + twemoji-color-font + vistafonts + ]) + ++ (with inputs.apple-fonts.packages.${pkgs.system}; [ + sf-pro + sf-mono + sf-compact + ]); + + fonts.fontconfig = { + enable = true; + defaultFonts = { + serif = [ + "Twemoji" + "DejaVu Serif" + ]; + sansSerif = [ + "Twemoji" + "DejaVu Sans" + ]; + monospace = [ + "Fira Code" + "FiraCode Nerd Font Mono" + "Font Awesome 6 Pro Regular" + "Twemoji" + "DejaVu Sans Mono" + ]; + emoji = [ + "Twemoji" + "Noto Color Emoji" + ]; + }; + }; + }; + }; +} diff --git a/modules/desktop/firefox/default.nix b/modules/desktop/firefox/default.nix new file mode 100644 index 0000000..e7720b2 --- /dev/null +++ b/modules/desktop/firefox/default.nix @@ -0,0 +1,39 @@ +{ + config, + lib, + pkgs, + ... +}: let + extraPrefs = import ./extraPrefs.nix; + userChrome = import ./userChrome.nix; + my-firefox = pkgs.firefox.override { + extraPrefs = extraPrefs; + }; + + inherit (lib) mkIf; + cfg = config.desktop; +in { + config = mkIf cfg.firefox { + default.browser = lib.mkDefault "firefox"; + + home-manager.users.${config.user} = { + programs.firefox = { + enable = true; + package = my-firefox; + + # import configuration + policies = import ./policy.nix; + + # create profile for me :3 + profiles.${config.user} = { + search = { + force = true; + default = "ddg"; + }; + + userChrome = userChrome; + }; + }; + }; + }; +} diff --git a/modules/desktop/firefox/extraPrefs.nix b/modules/desktop/firefox/extraPrefs.nix new file mode 100644 index 0000000..74db984 --- /dev/null +++ b/modules/desktop/firefox/extraPrefs.nix @@ -0,0 +1,21 @@ +# extra preferences that cannot be +# set normally but have to instead +# set in mosilla.cfg +'' // + + // Automatically click cookiebanners although uBlock Origin might block them + lockPref("cookiebanners.bannerClicking.enabled", true); + lockPref("cookiebanners.service.mode", 2); + lockPref("cookiebanners.service.mode.privateBrowsing", 2); + + // DNT although PrivacyBadger from policy handles this + lockPref("privacy.donottrackheader.enabled", true); + lockPref("privacy.donottrackheader.value", 1); + + // New sidebar + lockPref("sidebar.revamp", true); + lockPref("sidebar.verticalTabs", true); + lockPref("sidebar.visibility", "always-show"); + lockPref("sidebar.main.tools", "history,bookmarks"); + + //'' diff --git a/modules/desktop/firefox/policy.nix b/modules/desktop/firefox/policy.nix new file mode 100644 index 0000000..e222553 --- /dev/null +++ b/modules/desktop/firefox/policy.nix @@ -0,0 +1,127 @@ +{ + # policies to be set in firefox + # see: https://mozilla.github.io/policy-templates/ + + ExtensionSettings = import ./policyExtensions.nix; + Preferences = import ./policyPrefs.nix; + + EnableTrackingProtection = { + Value = true; + Locked = true; + Cryptomining = true; + Fingerprinting = true; + EmailTracking = true; + }; + + # Certificates + Certificates = { + ImportEnterpriseRoots = true; + }; + + # Cookies + Cookies = { + Behavior = "reject-foreign"; + BehaviorPrivateBrowsing = "reject-foreign"; + Locked = true; + }; + + # DNS + DNSOverHTTPS = { + Enabled = false; + Locked = true; + }; + + # Disable Bad + DisableAppUpdate = true; + DisableAccounts = true; + DisableFirefoxAccounts = true; + DisableFirefoxScreenshots = true; + DisableFirefoxStudies = true; + DisablePocket = true; + DisableTelemetry = true; + AutofillAddressEnabled = false; + AutofillCreditCardEnabled = false; + + # Disable Certain Messages + UserMessaging = { + WhatsNew = false; + ExtensionRecommendations = false; + FeatureRecommendations = false; + UrlbarInterventions = false; + SkipOnboarding = true; + MoreFromMozilla = false; + Labs = false; + Locked = true; + }; + + # Disable Password Manager + DisableMasterPasswordCreation = true; + PasswordManagerEnabled = false; + PrimaryPassword = false; + OfferToSaveLogins = false; + + # Remove Special Pages + OverrideFirstRunPage = ""; + OverridePostUpdatePage = ""; + + # Start Page + Homepage = { + StartPage = "previous-session"; + Locked = true; + }; + + # Home Page + FirefoxHome = { + Search = true; + TopSites = false; + SponsoredTopSites = false; + Highlights = false; + Pocket = false; + SponsoredPocket = false; + Snippets = false; + Locked = true; + }; + + # Search Suggestions + SearchSuggestEnabled = true; + FirefoxSuggest = { + WebSuggestions = false; + SponsoredSuggestions = false; + ImproveSuggest = false; + Locked = true; + }; + + # Save All on Shutdown + SanitizeOnShutdown = false; + + # Popups + PopupBlocking = { + Default = true; + Locked = true; + }; + + # Allow Bypasses + DisableSecurityBypass = { + InvalidCertificate = false; + SafeBrowsing = false; + }; + + # PictureInPicure + PictureInPicture = { + Enabled = true; + Locked = true; + }; + + # Topbar + SearchBar = "unified"; + DisplayMenuBar = "default-off"; + DisplayBookmarksToolbar = "newtab"; + NoDefaultBookmarks = true; + + # Miscellaneous + HttpsOnlyMode = "force_enabled"; + HardwareAcceleration = true; + DontCheckDefaultBrowser = true; + PromptForDownloadLocation = false; + PrivateBrowsingModeAvailability = 0; +} diff --git a/modules/desktop/firefox/policyExtensions.nix b/modules/desktop/firefox/policyExtensions.nix new file mode 100644 index 0000000..51d7e9d --- /dev/null +++ b/modules/desktop/firefox/policyExtensions.nix @@ -0,0 +1,62 @@ +{ + # extensions to be auto downloaded into + # firefox + + # dont allow extensions to be installed though + # firefox, they must be described here! + "*".installation_mode = "blocked"; + + # uBlock Origin + "uBlock0@raymondhill.net" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; + installation_mode = "force_installed"; + }; + + # Bitwarden + "{446900e4-71c2-419f-a6a7-df9c091e268b}" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi"; + installation_mode = "force_installed"; + }; + + # User Agent Switcher + "user-agent-switcher@ninetailed.ninja" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/uaswitcher/latest.xpi"; + installation_mode = "force_installed"; + }; + + # SponsorBlock + "sponsorBlocker@ajay.app" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/sponsorblock/latest.xpi"; + installation_mode = "force_installed"; + }; + + # Privacy Badger + "jid1-MnnxcxisBPnSXQ@jetpack" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi"; + installation_mode = "force_installed"; + }; + + # FoxyProxy + "foxyproxy@eric.h.jung" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/foxyproxy-standard/latest.xpi"; + installation_mode = "force_installed"; + }; + + # Redirector + "redirector@einaregilsson.com" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/redirector/latest.xpi"; + installation_mode = "force_installed"; + }; + + # linkding + "{61a05c39-ad45-4086-946f-32adb0a40a9d}" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/linkding-extension/latest.xpi"; + installation_mode = "force_installed"; + }; + + # Bypass Paywalls Clean + "magnolia@12.34" = { + install_url = "https://f.freya.cat/xpi/bypass_paywalls_clean-4.1.4.0.xpi"; + installation_mode = "force_installed"; + }; +} diff --git a/modules/desktop/firefox/policyPrefs.nix b/modules/desktop/firefox/policyPrefs.nix new file mode 100644 index 0000000..73d2781 --- /dev/null +++ b/modules/desktop/firefox/policyPrefs.nix @@ -0,0 +1,128 @@ +let + # quick variables to specify + # locked true/false + lock-false = { + Value = false; + Status = "locked"; + }; + lock-true = { + Value = true; + Status = "locked"; + }; +in { + # about:config Preferences + # ... set policies that cannot be set using policies.json directly + + # allow userChrom.css + "toolkit.legacyUserProfileCustomizations.stylesheets" = lock-true; + + # dark theme + "extensions.activeThemeID" = { + Value = "firefox-compact-dark@mozilla.org"; + Status = "locked"; + }; + "layout.css.prefers-color-scheme.content-override" = { + Value = 0; + Status = "locked"; + }; + + # homepage + "browser.startup.homepage" = { + Value = "about:home"; + Status = "locked"; + }; + "browser.newtabpage.enabed" = lock-true; + "browser.newtabpage.url" = { + Value = "about:home"; + Status = "locked"; + }; + + # autofill + "browser.autofill.enabled" = lock-false; + "browser.formfill.enable" = lock-false; + + # search enable + "browser.urlbar.suggest.recentsearches" = lock-true; + "browser.urlbar.suggest.bookmark" = lock-true; + "browser.urlbar.suggest.clipboard" = lock-true; + "browser.urlbar.suggest.history" = lock-true; + + # search disable + "browser.urlbar.suggest.addons" = lock-false; + "browser.urlbar.suggest.calculator" = lock-false; + "browser.urlbar.suggest.engines" = lock-false; + "browser.urlbar.suggest.fakespot" = lock-false; + "browser.urlbar.suggest.mdn" = lock-false; + "browser.urlbar.suggest.openpage" = lock-false; + "browser.urlbar.suggest.pocket" = lock-false; + "browser.urlbar.suggest.remotetab" = lock-false; + "browser.urlbar.suggest.topsites" = lock-false; + "browser.urlbar.suggest.trending" = lock-false; + "browser.urlbar.suggest.weather" = lock-false; + "browser.urlbar.suggest.yelp" = lock-false; + + # privacy + "privacy.globalprivacycontrol.enabled" = lock-true; + + # security + "security.OCSP.enabled" = { + Value = 0; + Status = "locked"; + }; + "browser.contentblocking.category" = { + Value = "strict"; + Status = "locked"; + }; + "xpinstall.whitelist.required" = lock-true; + "signon.management.page.breach-alerts.enabled" = lock-false; + + # graphics + "dom.webgpu.enabled" = lock-true; + "media.eme.enabled" = lock-true; + + # user messaging + # ... disable shit that is annoying + "browser.newtabpage.activity-stream.feeds.section.topstories" = lock-false; + "browser.newtabpage.activity-stream.feeds.snippets" = lock-false; + "browser.newtabpage.activity-stream.section.highlights.includePocket" = lock-false; + "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = lock-false; + "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = lock-false; + "browser.newtabpage.activity-stream.section.highlights.includeVisited" = lock-false; + "browser.newtabpage.activity-stream.showSponsored" = lock-false; + "browser.newtabpage.activity-stream.system.showSponsored" = lock-false; + "browser.newtabpage.activity-stream.showSponsoredTopSites" = lock-false; + "browser.newtabpage.activity-stream.showWeather" = lock-false; + "browser.newtabpage.activity-stream.newtabWallpapers.enabled" = lock-false; + "browser.newtabpage.activity-stream.newtabWallpapers.v2.enabled" = lock-false; + "browser.newtabpage.activity-stream.default.sites" = { + Value = ""; + Status = "locked"; + }; + + # safebrowsing + "browser.safebrowsing.malware.enabled" = lock-true; + "browser.safebrowsing.phishing.enabled" = lock-true; + "browser.safebrowsing.downloads.enabled" = lock-true; + "browser.safebrowsing.downloads.remote.block_uncommon" = lock-false; + "browser.safebrowsing.downloads.remote.block_potentially_unwanted" = lock-false; + + # sidebar + "browser.tabs.inTitlebar" = { + Value = 0; + Status = "locked"; + }; + "browser.tabs.warnOnClose" = lock-true; + "browser.tabs.firefox-view" = lock-false; + "browser.tabs.closeTabByDblclick" = lock-true; + "ui.key.menuAccessKeyFocuses" = lock-false; + + # general settings + "general.autoScroll" = lock-false; + "general.smoothScroll" = lock-true; + "widget.gtk.overlay-scrollbars.enabled" = lock-false; + "accessibility.browsewithcaret" = lock-false; + "accessibility.typeaheadfind" = lock-false; + "media.hardwaremediakeys.enabled" = lock-true; + "browser.crashReports.unsubmittedCheck.autoSubmit2" = lock-false; + "browser.aboutConfig.showWarning" = lock-false; +} diff --git a/modules/desktop/firefox/userChrome.nix b/modules/desktop/firefox/userChrome.nix new file mode 100644 index 0000000..ab93747 --- /dev/null +++ b/modules/desktop/firefox/userChrome.nix @@ -0,0 +1,23 @@ +'' + /* sidebar hack to flip contents the way i want them (arrows on the left) */ + #nav-bar-customization-target { + flex-direction: row-reverse; + } + + /* remove broken padding from sidebar hack */ + #unified-extensions-button { + padding-left: 0 !important; + } + + /* remove padding beside search bar */ + toolbarspring { + display: none !important; + } + + /* remove overflow menu and everything in it */ + #nav-bar-overflow-button, + #firefox-view-button, + #alltabs-button { + visibility: collapse; + } +'' diff --git a/modules/desktop/hypridle.nix b/modules/desktop/hypridle.nix new file mode 100644 index 0000000..01d4996 --- /dev/null +++ b/modules/desktop/hypridle.nix @@ -0,0 +1,45 @@ +{ + config, + lib, + ... +}: let + inherit (lib) mkIf; + cfg = config.desktop; +in { + config = mkIf cfg.hypridle { + home-manager.users.${config.user} = { + services.hypridle = { + enable = true; + + settings = { + general = { + lock_cmd = "pidof hyprlock || hyprlock"; + before_sleep_cmd = "loginctl lock-session"; + after_sleep_cmd = "hyprctl dispatch dpms on"; + ignore_dbus_inhibit = false; + }; + + listener = [ + # dim screen + { + timeout = 150; + on-timeout = "brightnessctl -s set 10"; + on-resume = "brightnessctl -r"; + } + # lock + { + timeout = 300; + on-timeout = "loginctl lock-session"; + } + # turn off screen + { + timeout = 350; + on-timeout = "hyprctl dispatch dpms off"; + on-resume = "hyprctl dispatch dpms on"; + } + ]; + }; + }; + }; + }; +} diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix new file mode 100644 index 0000000..10b058d --- /dev/null +++ b/modules/desktop/hyprland.nix @@ -0,0 +1,353 @@ +{ + config, + pkgs, + lib, + inputs, + ... +}: let + system = pkgs.stdenv.hostPlatform.system; + hyprland = inputs.hyprland.packages.${system}; + hyprland-plugins = inputs.hyprland-plugins.packages.${system}; + hy3 = inputs.hy3.packages.${system}; + + fg = "rgb(${config.theme.colors.fg})"; + bg = "rgb(${config.theme.colors.bg})"; + primary = "rgb(${config.theme.colors.primary})"; + inactive = "rgb(${config.theme.colors.surface.bg})"; + + debug = false; + + inherit (lib) mkIf; + cfg = config.desktop; +in { + config = mkIf cfg.hyprland { + environment = { + variables = { + HYPRLAND_TRACE = + if debug + then "1" + else "0"; + AQ_TRACE = + if debug + then "1" + else "0"; + + XDG_CURRENT_DESKTOP = "Hyprland"; + XDG_SESSION_TYPE = "wayland"; + XDG_SESSION_DESKTOP = "Hyprland"; + LIBSEAT_BACKEND = "logind"; + }; + sessionVariables = { + XCURSOR_THEME = "Adwaita"; + XCURSOR_SIZE = "24"; + + GTK_THEME = "Orchis-Teal-Dark"; + + MOZ_ENABLE_WAYLAND = "1"; + MOZ_USE_XINPUT = "1"; + _JAVA_AWT_WM_NONREPARENTING = "1"; + }; + }; + + xdg.portal = { + enable = true; + xdgOpenUsePortal = true; + config = { + common.default = ["gtk"]; + hyprland.default = ["gtk" "hyprland"]; + }; + extraPortals = [ + pkgs.xdg-desktop-portal-gtk + pkgs.xdg-desktop-portal-wlr + hyprland.xdg-desktop-portal-hyprland + ]; + }; + + programs.xwayland.enable = true; + + home-manager.users.${config.user} = { + wayland.windowManager.hyprland = { + enable = true; + package = hyprland.hyprland; + + xwayland.enable = true; + systemd.enable = true; + + # Plugins + plugins = [ + hyprland-plugins.hyprexpo + hy3.hy3 + ]; + + # Config + settings = { + # Debug + debug.disable_logs = ! debug; + debug.disable_time = ! debug; + debug.enable_stdout_logs = debug; + + # Monitors + monitor = + map ( + monitor: "${monitor.name}, highres, auto, ${toString monitor.scale}, bitdepth, ${toString monitor.bitdepth}" + ) + config.monitors; + + # Autostart + exec-once = config.autoRun; + + # General + general = { + gaps_in = config.theme.innerGap; + gaps_out = config.theme.outerGap; + layout = "hy3"; + resize_on_border = "yes"; + extend_border_grab_area = 20; + border_size = config.theme.borderWidth; + "col.active_border" = "${primary}"; + "col.inactive_border" = "${inactive}"; + }; + + # Gestures + gestures = { + workspace_swipe = true; + workspace_swipe_fingers = 3; + workspace_swipe_forever = true; + workspace_swipe_cancel_ratio = 0.15; + }; + + # Decoration + decoration = { + rounding = config.theme.outerRadius; + shadow.enabled = false; + blur = { + enabled = config.theme.blur; + size = 4; + passes = 2; + noise = 0.008; + contrast = 0.8916; + brightness = 0.8; + }; + }; + + # Animations + animations = { + enabled = true; + + bezier = [ + "windowIn, 0.06, 0.71, 0.25, 1" + "windowResize, 0.04, 0.67, 0.38, 1" + ]; + + animation = [ + "windowsIn, 1, 3, windowIn, slide #popin 20%" + "windowsOut, 1, 3, windowIn, slide #popin 70%" + "windowsMove, 1, 2.5, windowResize" + "border, 1, 10, default" + "borderangle, 1, 8, default" + "fade, 1, 3, default" + "workspaces, 1, 6, default" + "layers, 1, 5, windowIn, slide" + ]; + }; + + # Input + input = { + kb_layout = "us"; + kb_variant = ""; + kb_model = ""; + kb_options = "gtp:alt_shift_toggle, compose:ralt"; + kb_rules = ""; + follow_mouse = 1; + touchpad = { + natural_scroll = "yes"; + }; + sensitivity = 0; + }; + + # Keybinds + "$mod" = "SUPER"; + bind = [ + # Launch programs + + "$mod, W, exec, ${config.default.browser}" + "$mod, D, exec, ${config.default.appLauncher}" + "$mod, L, exec, ${config.default.lockScreen}" + "$mod, Return, exec, ${config.default.terminal}" + ", Print, exec, grimblast copy area" + + # Misc + + "$mod SHIFT, L, exit" + "$mod, tab, hyprexpo:expo, toggle" + + # Window operations + + "$mod SHIFT, Q, killactive" + "$mod SHIFT, SPACE, togglefloating" + "$mod, F, fullscreen" + "$mod, J, togglesplit" + + # Move focus with mod + arrow keys + + "$mod, left, movefocus, l" + "$mod, right, movefocus, r" + "$mod, up, movefocus, u" + "$mod, down, movefocus, d" + + # Move window across workspace with mod + arrow keys + + "$mod SHIFT, left, hy3:movewindow, l" + "$mod SHIFT, right, hy3:movewindow, r" + "$mod SHIFT, up, hy3:movewindow, u" + "$mod SHIFT, down, hy3:movewindow, d" + + # Switch workspaces with mod + [0-9] + + "$mod, 1, workspace, 1" + "$mod, 2, workspace, 2" + "$mod, 3, workspace, 3" + "$mod, 4, workspace, 4" + "$mod, 5, workspace, 5" + "$mod, 6, workspace, 6" + "$mod, 7, workspace, 7" + "$mod, 8, workspace, 8" + "$mod, 9, workspace, 9" + + # Move active window to a workspace with mod + SHIFT + [0-9] + + "$mod SHIFT, 1, movetoworkspacesilent, 1" + "$mod SHIFT, 2, movetoworkspacesilent, 2" + "$mod SHIFT, 3, movetoworkspacesilent, 3" + "$mod SHIFT, 4, movetoworkspacesilent, 4" + "$mod SHIFT, 5, movetoworkspacesilent, 5" + "$mod SHIFT, 6, movetoworkspacesilent, 6" + "$mod SHIFT, 7, movetoworkspacesilent, 7" + "$mod SHIFT, 8, movetoworkspacesilent, 8" + "$mod SHIFT, 9, movetoworkspacesilent, 9" + "$mod SHIFT, 0, movetoworkspacesilent, 10" + + # Move to tab + + "LALT, 1, hy3:focustab, index, 01" + "LALT, 2, hy3:focustab, index, 02" + "LALT, 3, hy3:focustab, index, 03" + "LALT, 4, hy3:focustab, index, 04" + "LALT, 5, hy3:focustab, index, 05" + "LALT, 6, hy3:focustab, index, 06" + "LALT, 7, hy3:focustab, index, 07" + "LALT, 8, hy3:focustab, index, 08" + "LALT, 9, hy3:focustab, index, 09" + "LALT, 0, hy3:focustab, index, 10" + + "$mod SHIFT, B, hy3:makegroup, h" + "$mod SHIFT, V, hy3:makegroup, v" + "$mod SHIFT, C, hy3:changegroup, toggletab" + + # Scroll through existing workspaces with mod + scroll + + "$mod, mouse_down, workspace, e+1" + "$mod, mouse_up, workspace, e-1" + ]; + + bindn = [ + # Focus windows with scroll wheel or middle click + + ", mouse:272, hy3:focustab, mouse" + ", mouse_down, hy3:focustab, l, require_hovered" + ", mouse_up, hy3:focustab, r, require_hovered" + ]; + + bindm = [ + # Move/resize windows with mod + LMB/RMB and dragging + + "$mod, mouse:272, movewindow" + "$mod, mouse:273, resizewindow" + ]; + + binde = [ + # Audio + + # raise volume + ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+" + # lower volume + ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" + # mute speaker + ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" + # mute mic + ", XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle" + + # Media + + # play + ", XF86AudioPlay, exec, playerctl play-pause" + # next + ", XF86AudioNext, exec, playerctl next" + # prev + ", XF86AudioPrev, exec, playerctl previous" + + # Backlight + + ", XF86MonBrightnessDown, exec, brightnessctl set 5%-" + ", XF86MonBrightnessUp, exec, brightnessctl set 5%+" + ]; + + # Plugin configuration + plugin = { + # hy3 + hy3 = { + tabs = { + height = 24; + text_height = 9; + text_padding = 10; + padding = 2; + render_text = true; + text_font = "monospace"; + radius = config.theme.outerRadius; + border_width = config.theme.borderWidth; + + "col.active" = "${bg}"; + "col.active.border" = "${inactive}"; + "col.active.text" = "${fg}"; + "col.inactive" = "${bg}"; + "col.inactive.border" = "${inactive}"; + "col.inactive.text" = "${fg}"; + }; + + autotile = { + enable = true; + }; + }; + }; + + # XWayland + xwayland = { + force_zero_scaling = "true"; + use_nearest_neighbor = "false"; + }; + + # Misc + misc = { + disable_hyprland_logo = true; + disable_splash_rendering = true; + key_press_enables_dpms = true; + mouse_move_enables_dpms = true; + enable_anr_dialog = false; + vrr = 1; + }; + + # Ecosystem + ecosystem = { + no_update_news = true; + no_donation_nag = true; + }; + + # Experimental + experimental = { + xx_color_management_v4 = true; + }; + }; # end settings + }; # end hyprland + }; # end home-manager + }; +} diff --git a/modules/desktop/hyprlock.nix b/modules/desktop/hyprlock.nix new file mode 100644 index 0000000..9237be5 --- /dev/null +++ b/modules/desktop/hyprlock.nix @@ -0,0 +1,87 @@ +{ + config, + lib, + ... +}: let + fg = "rgb(${config.theme.colors.fg})"; + bg = "rgb(${config.theme.colors.bg})"; + error = "rgb(${config.theme.colors.error})"; + trans = "rgba(0,0,0,0)"; + + inherit (lib) mkIf; + cfg = config.desktop; +in { + config = mkIf cfg.hyprlock { + default.lockScreen = lib.mkDefault "hyprlock"; + + home-manager.users.${config.user} = { + programs.hyprlock = { + enable = true; + + settings = { + background = { + path = config.theme.lockscreen; + color = bg; + blur_passes = 0; + blur_size = 2; + noise = 0; + contrast = 0; + brightness = 0; + vibrancy = 0; + vibrancy_darkness = 0.0; + }; + + # Password Input + input-field = { + size = "300, 30"; + outline_thickness = 0; + dots_size = 0.25; + dots_spacing = 0.55; + dots_center = true; + dots_rounding = -1; + outer_color = trans; + inner_color = trans; + font_color = fg; + fade_on_empty = false; + placeholder_text = "Enter Password"; + hide_input = false; + check_color = error; + fail_color = error; + capslock_color = -1; + numlock_color = -1; + bothlock_color = -1; + invert_numlock = false; + swap_font_color = false; + font_family = config.theme.font.regular; + position = "0, 50"; + halign = "center"; + valign = "bottom"; + }; + + label = [ + # Date + { + text = "cmd[update:1000] echo \"$(date +\"%A, %B %d\")\""; + color = fg; + font_size = 20; + font_family = config.theme.font.header; + position = "0, -100"; + halign = "center"; + valign = "top"; + } + # Clock + { + text = "cmd[update:1000] echo \"$(date +\"%k:%M:%S\")\""; + color = fg; + font_size = 90; + font_family = config.theme.font.header; + position = "0, -130"; + halign = "center"; + valign = "top"; + } + ]; + }; + }; + }; + }; +} diff --git a/modules/desktop/hyprpaper.nix b/modules/desktop/hyprpaper.nix new file mode 100644 index 0000000..045ae62 --- /dev/null +++ b/modules/desktop/hyprpaper.nix @@ -0,0 +1,22 @@ +{ + config, + lib, + ... +}: let + inherit (lib) mkIf; + cfg = config.desktop; +in { + config = mkIf cfg.hyprpaper { + home-manager.users.${config.user} = { + services.hyprpaper = { + enable = true; + + settings = { + preload = config.theme.wallpaper; + wallpaper = ",${config.theme.wallpaper}"; + splash = false; + }; + }; + }; + }; +} diff --git a/modules/desktop/mako.nix b/modules/desktop/mako.nix new file mode 100644 index 0000000..17ed94f --- /dev/null +++ b/modules/desktop/mako.nix @@ -0,0 +1,35 @@ +{ + config, + lib, + ... +}: let + inherit (lib) mkIf; + cfg = config.desktop; +in { + config = mkIf cfg.mako { + home-manager.users.${config.user} = { + services.mako = { + enable = false; # now using astal + + settings = { + font = "${config.theme.font.monospace} 11"; + + margin = toString config.theme.outerGap; + padding = toString config.theme.innerGap; + + background-color = "#${config.theme.colors.bg}"; + progress-color = "#${config.theme.colors.primary}"; + text-color = "#${config.theme.colors.fg}"; + + border-color = "#${config.theme.colors.fg}"; + border-size = config.theme.borderWidth; + border-radius = config.theme.outerRadius; + + default-timeout = 5000; + layer = "overlay"; + icons = true; + }; + }; + }; + }; +} diff --git a/modules/desktop/waybar/default.nix b/modules/desktop/waybar/default.nix new file mode 100644 index 0000000..c2d6927 --- /dev/null +++ b/modules/desktop/waybar/default.nix @@ -0,0 +1,87 @@ +{ + config, + lib, + ... +}: let + inherit (lib) mkIf; + cfg = config.desktop; +in { + config = mkIf cfg.waybar { + home-manager.users.${config.user} = { + programs.waybar = { + enable = false; # using astal now + + settings = [ + { + height = 24; + layer = "top"; + position = "top"; + spacing = 4; + + modules-left = [ + "hyprland/workspaces" + ]; + modules-center = [ + "clock" + ]; + modules-right = [ + "battery" + "wireplumber" + "network" + "tray" + ]; + + "hyprland/workspaces" = { + disable-scroll = true; + all-outputs = true; + format = "{name}"; + }; + + battery = { + interval = 1; + states = { + warning = 30; + critical = 15; + }; + format = " {capacity}%"; + format-charging = " {capacity}%"; + format-plugged = " {capacity}%"; + format-full = " {capacity}%"; + format-warning = " {capacity}%"; + format-critical = " {capacity}%"; + }; + + wireplumber = { + format = " {volume}%"; + format-bluetooth = " {volume}%"; + format-muted = " muted"; + scroll-step = 1; + on-click = "pavucontrol"; + ignored-sinks = ["Easy Effects Sink"]; + }; + + network = { + format = " disconnected"; + format-wifi = " {essid}"; + format-ethernet = " {ipaddr}/{cidr}"; + format-disconnected = " disconnected"; + max-length = 50; + on-click = "nm-connection-editor"; + }; + + clock = { + interval = 1; + format = "{:%Y-%m-%d %a %H:%M:%S}"; + }; + + tray = { + spacing = config.theme.outerGap; + }; + } + ]; + + style = import ./style.nix {theme = config.theme;}; + }; + }; + }; +} diff --git a/modules/desktop/waybar/style.nix b/modules/desktop/waybar/style.nix new file mode 100644 index 0000000..33db673 --- /dev/null +++ b/modules/desktop/waybar/style.nix @@ -0,0 +1,108 @@ +{theme}: let + fg = "#${theme.colors.fg}"; + bg = "#${theme.colors.bg}"; + surface-fg = "#${theme.colors.surface.fg}"; + surface-bg = "#${theme.colors.surface.bg}"; + primary = "#${theme.colors.primary}"; + success = "#${theme.colors.success}"; + warning = "#${theme.colors.warning}"; + error = "#${theme.colors.error}"; + fontSize = "${toString theme.font.size}px"; + outerGap = "${toString theme.outerGap}px"; + innerGap = "${toString theme.innerGap}px"; + outerRadius = "${toString theme.outerRadius}px"; + innerRadius = "${toString theme.innerRadius}px"; + borderWidth = "${toString theme.borderWidth}px"; +in '' + /** Base */ + + * { + all: unset; + } + + window#waybar { + font-family: "${theme.font.regular}", "${theme.font.icon}", "${theme.font.monospace}"; + font-size: ${fontSize}; + color: ${fg}; + background-color: ${bg}; + } + + /** Workspaces */ + + #workspaces { + margin-left: ${outerGap}; + } + + #workspaces button { + border-radius: ${innerRadius}; + margin: 4px 2px; + padding: 0px 7px; + background: ${surface-bg}; + color: ${surface-fg}; + } + + #workspaces button.focused, + #workspaces button.active { + background: ${primary}; + color: ${bg}; + } + + #workspaces button.urgent { + background: ${error}; + } + + /** Tray */ + + #tray { + border: none; + margin-right: ${outerGap}; + } + + #tray > .passive { + -gtk-icon-effect: dim; + } + + #tray > .needs-attention { + -gtk-icon-effect: highlight; + } + + /** Right modules */ + + #battery, + #wireplumber, + #network { + padding: 0 ${outerGap}; + } + + /** Battery */ + + #battery.charging { + color: ${success}; + } + + #battery.warning:not(.charging) { + color: ${warning}; + } + + #battery.critical:not(.charging) { + color: ${error}; + } + + /** Wireplumber */ + + #wireplumber.muted { + color: ${error}; + } + + /** Network */ + + #network.wifi, + #network.ethernet { + color: ${success}; + } + + #network.disconnected { + color: ${error}; + } + +'' diff --git a/modules/desktop/wofi/default.nix b/modules/desktop/wofi/default.nix new file mode 100644 index 0000000..aa04495 --- /dev/null +++ b/modules/desktop/wofi/default.nix @@ -0,0 +1,29 @@ +{ + config, + lib, + ... +}: let + inherit (lib) mkIf; + cfg = config.desktop; +in { + config = mkIf cfg.wofi { + default.appLauncher = lib.mkDefault "wofi --show drun --prompt 'Seach Programs'"; + + home-manager.users.${config.user} = { + programs.wofi = { + enable = true; + + settings = { + key_expand = "Tab"; + term = "kitty"; + matching = "multi-contains"; + insensitive = true; + gtk_dark = true; + hide_scroll = true; + }; + + style = import ./style.nix {theme = config.theme;}; + }; + }; + }; +} diff --git a/modules/desktop/wofi/style.nix b/modules/desktop/wofi/style.nix new file mode 100644 index 0000000..27b7205 --- /dev/null +++ b/modules/desktop/wofi/style.nix @@ -0,0 +1,74 @@ +{theme}: let + fg = "#${theme.colors.fg}"; + bg = "#${theme.colors.bg}"; + surface-fg = "#${theme.colors.surface.fg}"; + surface-bg = "#${theme.colors.surface.bg}"; + primary = "#${theme.colors.primary}"; + fontSize = "${toString theme.font.size}px"; + outerGap = "${toString theme.outerGap}px"; + innerGap = "${toString theme.innerGap}px"; + outerRadius = "${toString theme.outerRadius}px"; + innerRadius = "${toString theme.innerRadius}px"; + borderWidth = "${toString theme.borderWidth}px"; +in '' + * { + font-family: ${theme.font.monospace}; + font-size: ${fontSize}; + } + + /* Window */ + window { + margin: 0px; + border: ${borderWidth} solid ${primary}; + border-radius: ${outerRadius}; + background-color: ${bg}; + } + + /* Outer Box */ + #outer-box { + padding: ${outerGap}; + } + + /* Scroll */ + #scroll { + margin: 0px; + padding: ${innerGap}; + border: none; + } + + /* Input */ + #input { + margin: ${innerGap}; + padding: ${innerGap}; + border: none; + color: ${surface-fg}; + background-color: ${surface-bg}; + border-radius: ${outerRadius}; + } + + #input:focus, + #input:active { + border: ${borderWidth} solid ${primary}; + box-shadow: none; + outline: none; + } + + /* Text */ + #text { + margin: ${innerGap}; + padding: ${innerGap}; + border: none; + color: ${fg}; + } + + /* Selected Entry */ + #entry:selected { + background-color: ${primary}; + border-radius: ${outerRadius}; + } + + #entry:selected #text { + color: ${bg}; + } + +'' diff --git a/modules/development/default.nix b/modules/development/default.nix new file mode 100644 index 0000000..486a220 --- /dev/null +++ b/modules/development/default.nix @@ -0,0 +1,49 @@ +{ + lib, + config, + pkgs, + ... +}: let + inherit (lib) mkEnableOption optionals; + cfg = config.development; +in { + options.development = { + c = mkEnableOption "Enable c/c++ development tools."; + java = mkEnableOption "Enable java/kotlin development tools."; + rust = mkEnableOption "Enable rust development tools."; + zig = mkEnableOption "Enable zig development tools."; + }; + + config = { + home-manager.users.${config.user} = { + home.packages = with pkgs; + (optionals cfg.c [ + clang-tools + gcc + gdb + gnumake + nasm + pkg-config + ]) + ++ (optionals cfg.rust [ + rustc + rustfmt + rust-analyzer + cargo + clippy + ]) + ++ (optionals cfg.java [ + gradle + jdk + jdt-language-server + kotlin + kotlin-language-server + maven + ]) + ++ (optionals cfg.zig [ + zig + zls + ]); + }; + }; +} diff --git a/modules/gaming/default.nix b/modules/gaming/default.nix new file mode 100644 index 0000000..a0c826c --- /dev/null +++ b/modules/gaming/default.nix @@ -0,0 +1,19 @@ +{ + lib, + config, + ... +}: let + inherit (lib) mkEnableOption; +in { + imports = [ + ./homestuck.nix + ./minecraft.nix + ./steam.nix + ]; + + options.gaming = { + homestuck = mkEnableOption "Install the unofficial homestuck collection."; + minecraft = mkEnableOption "Install the minecraft block game."; + steam = mkEnableOption "Install the steam game launcher."; + }; +} diff --git a/modules/gaming/homestuck.nix b/modules/gaming/homestuck.nix new file mode 100644 index 0000000..12641a4 --- /dev/null +++ b/modules/gaming/homestuck.nix @@ -0,0 +1,19 @@ +{ + lib, + config, + pkgs, + inputs, + ... +}: let + inherit (lib) mkIf; + cfg = config.gaming; + system = pkgs.stdenv.hostPlatform.system; +in { + config = mkIf cfg.homestuck { + home-manager.users.${config.user} = { + home.packages = [ + inputs.self.packages.${system}.unofficial-homestuck-collection + ]; + }; + }; +} diff --git a/modules/gaming/minecraft.nix b/modules/gaming/minecraft.nix new file mode 100644 index 0000000..5de20e6 --- /dev/null +++ b/modules/gaming/minecraft.nix @@ -0,0 +1,17 @@ +{ + lib, + config, + pkgs, + ... +}: let + inherit (lib) mkIf; + cfg = config.gaming; +in { + config = mkIf cfg.minecraft { + home-manager.users.${config.user} = { + home.packages = with pkgs; [ + prismlauncher + ]; + }; + }; +} diff --git a/modules/gaming/steam.nix b/modules/gaming/steam.nix new file mode 100644 index 0000000..53ab252 --- /dev/null +++ b/modules/gaming/steam.nix @@ -0,0 +1,34 @@ +{ + lib, + config, + ... +}: let + inherit (lib) mkIf; + cfg = config.gaming; +in { + config = mkIf cfg.steam { + nixpkgs.config.allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "steam" + "steam-original" + "steam-runtime" + ]; + + programs.gamescope = { + enable = true; + capSysNice = true; + }; + + programs.steam = { + enable = true; + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = true; + localNetworkGameTransfers.openFirewall = true; + gamescopeSession.enable = true; + }; + + # controllers + hardware.xone.enable = true; + hardware.steam-hardware.enable = true; + }; +} diff --git a/modules/terminal/default.nix b/modules/terminal/default.nix new file mode 100644 index 0000000..8e9d5f8 --- /dev/null +++ b/modules/terminal/default.nix @@ -0,0 +1,15 @@ +{ + lib, + config, + ... +}: let + inherit (lib) mkEnableOption; +in { + imports = [ + ./kitty.nix + ]; + + options.terminal = { + kitty = mkEnableOption "Enable the kitty terminal."; + }; +} diff --git a/modules/terminal/kitty.nix b/modules/terminal/kitty.nix new file mode 100644 index 0000000..88aa151 --- /dev/null +++ b/modules/terminal/kitty.nix @@ -0,0 +1,84 @@ +{ + config, + lib, + ... +}: let + inherit (lib) mkIf; + cfg = config.terminal; +in { + config = mkIf cfg.kitty { + default.terminal = lib.mkDefault "kitty"; + + home-manager.users.${config.user} = { + programs.kitty = { + enable = true; + environment = {}; + extraConfig = ""; + + settings = { + # Font + font_family = config.theme.font.monospace; + font_size = 11; + bold_font = "auto"; + italic_font = "auto"; + bold_italic_font = "auto"; + + # Scrollback + scrollback_lines = 10000; + scrollback_pager_history_size = 300; # MB + + # Urls + detect_urls = true; + show_hyperlink_targets = false; + + # Window + window_padding_width = config.theme.outerGap; + window_border_width = 0; + draw_minimal_borders = true; + background_opacity = config.theme.opacity; + + # Disable audio + enable_audio_bell = false; + + # Disable close prompt + confirm_os_window_close = 0; + + # colors + background = "#${config.theme.colors.bg}"; + foreground = "#${config.theme.colors.fg}"; + selection_background = "#${config.theme.colors.surface.bg}"; + selection_foreground = "#${config.theme.colors.surface.fg}"; + url_color = "#${config.theme.colors.bright.yellow}"; + cursor = "#${config.theme.colors.fg}"; + active_border_color = "#${config.theme.colors.primary}"; + inactive_border_color = "#${config.theme.colors.bg}"; + active_tab_background = "#${config.theme.colors.bg}"; + active_tab_foreground = "#${config.theme.colors.fg}"; + inactive_tab_background = "#${config.theme.colors.bg}"; + inactive_tab_foreground = "#${config.theme.colors.fg}"; + tab_bar_background = "#${config.theme.colors.bg}"; + + # normal + color0 = "#${config.theme.colors.normal.black}"; + color1 = "#${config.theme.colors.normal.red}"; + color2 = "#${config.theme.colors.normal.green}"; + color3 = "#${config.theme.colors.normal.yellow}"; + color4 = "#${config.theme.colors.normal.blue}"; + color5 = "#${config.theme.colors.normal.magenta}"; + color6 = "#${config.theme.colors.normal.cyan}"; + color7 = "#${config.theme.colors.normal.white}"; + + # bright + color8 = "#${config.theme.colors.bright.black}"; + color9 = "#${config.theme.colors.bright.red}"; + color10 = "#${config.theme.colors.bright.green}"; + color11 = "#${config.theme.colors.bright.yellow}"; + color12 = "#${config.theme.colors.bright.blue}"; + color13 = "#${config.theme.colors.bright.magenta}"; + color14 = "#${config.theme.colors.bright.cyan}"; + color15 = "#${config.theme.colors.bright.white}"; + }; + }; + }; + }; +} diff --git a/modules/virt/default.nix b/modules/virt/default.nix new file mode 100644 index 0000000..c5d3960 --- /dev/null +++ b/modules/virt/default.nix @@ -0,0 +1,19 @@ +{ + lib, + config, + pkgs, + ... +}: let + inherit (lib) mkEnableOption; + cfg = config.virt; +in { + imports = [ + ./docker.nix + ./qemu.nix + ]; + + options.virt = { + docker = mkEnableOption "Install docker and its components."; + qemu = mkEnableOption "Install qemu and its components."; + }; +} diff --git a/modules/virt/docker.nix b/modules/virt/docker.nix new file mode 100644 index 0000000..5930858 --- /dev/null +++ b/modules/virt/docker.nix @@ -0,0 +1,15 @@ +{ + lib, + config, + pkgs, + ... +}: let + inherit (lib) mkIf; + cfg = config.virt; +in { + config = mkIf cfg.docker { + virtualisation.docker.enable = true; + virtualisation.docker.storageDriver = "btrfs"; + users.groups.docker.members = [config.user]; + }; +} diff --git a/modules/virt/qemu.nix b/modules/virt/qemu.nix new file mode 100644 index 0000000..f5d9d24 --- /dev/null +++ b/modules/virt/qemu.nix @@ -0,0 +1,20 @@ +{ + lib, + config, + pkgs, + ... +}: let + inherit (lib) mkIf; + cfg = config.virt; +in { + config = mkIf cfg.qemu { + programs.virt-manager.enable = true; + users.groups.libvirtd.members = [config.user]; + virtualisation.libvirtd.enable = true; + virtualisation.spiceUSBRedirection.enable = true; + + environment.systemPackages = with pkgs; [ + qemu + ]; + }; +} diff --git a/programs/astal/default.nix b/programs/astal/default.nix deleted file mode 100644 index 1b43dbe..0000000 --- a/programs/astal/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - lib, - config, - pkgs, - inputs, - ... -}: let - system = pkgs.stdenv.hostPlatform.system; - astal = inputs.self.packages.${system}; -in { - default.appLauncher = lib.mkDefault "astal-launcher"; - - home-manager.users.${config.user} = { - home.packages = [ - astal.astal.shell - astal.astal.launcher - ]; - }; -} diff --git a/programs/default.nix b/programs/default.nix deleted file mode 100644 index 692113e..0000000 --- a/programs/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{...}: { - imports = [ - ./astal - ./firefox - ./git - ./gpg - ./hypr - ./kitty - ./mako - ./neovim - ./ssh - ./starship - ./steam - ./talc - ./tmux - ./unofficial-homestuck-collection - ./waybar - ./wofi - ./zsh - ]; -} diff --git a/programs/firefox/default.nix b/programs/firefox/default.nix deleted file mode 100644 index 58aa83c..0000000 --- a/programs/firefox/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - extraPrefs = import ./extraPrefs.nix; - - userChrome = import ./userChrome.nix; - - my-firefox = pkgs.firefox.override { - extraPrefs = extraPrefs; - }; -in { - default.browser = lib.mkDefault "firefox"; - - home-manager.users.${config.user} = { - programs.firefox = { - enable = true; - package = my-firefox; - - # import configuration - policies = import ./policy.nix; - - # create profile for me :3 - profiles.${config.user} = { - search = { - force = true; - default = "ddg"; - }; - - userChrome = userChrome; - }; - }; - }; -} diff --git a/programs/firefox/extraPrefs.nix b/programs/firefox/extraPrefs.nix deleted file mode 100644 index 74db984..0000000 --- a/programs/firefox/extraPrefs.nix +++ /dev/null @@ -1,21 +0,0 @@ -# extra preferences that cannot be -# set normally but have to instead -# set in mosilla.cfg -'' // - - // Automatically click cookiebanners although uBlock Origin might block them - lockPref("cookiebanners.bannerClicking.enabled", true); - lockPref("cookiebanners.service.mode", 2); - lockPref("cookiebanners.service.mode.privateBrowsing", 2); - - // DNT although PrivacyBadger from policy handles this - lockPref("privacy.donottrackheader.enabled", true); - lockPref("privacy.donottrackheader.value", 1); - - // New sidebar - lockPref("sidebar.revamp", true); - lockPref("sidebar.verticalTabs", true); - lockPref("sidebar.visibility", "always-show"); - lockPref("sidebar.main.tools", "history,bookmarks"); - - //'' diff --git a/programs/firefox/policy.nix b/programs/firefox/policy.nix deleted file mode 100644 index e222553..0000000 --- a/programs/firefox/policy.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ - # policies to be set in firefox - # see: https://mozilla.github.io/policy-templates/ - - ExtensionSettings = import ./policyExtensions.nix; - Preferences = import ./policyPrefs.nix; - - EnableTrackingProtection = { - Value = true; - Locked = true; - Cryptomining = true; - Fingerprinting = true; - EmailTracking = true; - }; - - # Certificates - Certificates = { - ImportEnterpriseRoots = true; - }; - - # Cookies - Cookies = { - Behavior = "reject-foreign"; - BehaviorPrivateBrowsing = "reject-foreign"; - Locked = true; - }; - - # DNS - DNSOverHTTPS = { - Enabled = false; - Locked = true; - }; - - # Disable Bad - DisableAppUpdate = true; - DisableAccounts = true; - DisableFirefoxAccounts = true; - DisableFirefoxScreenshots = true; - DisableFirefoxStudies = true; - DisablePocket = true; - DisableTelemetry = true; - AutofillAddressEnabled = false; - AutofillCreditCardEnabled = false; - - # Disable Certain Messages - UserMessaging = { - WhatsNew = false; - ExtensionRecommendations = false; - FeatureRecommendations = false; - UrlbarInterventions = false; - SkipOnboarding = true; - MoreFromMozilla = false; - Labs = false; - Locked = true; - }; - - # Disable Password Manager - DisableMasterPasswordCreation = true; - PasswordManagerEnabled = false; - PrimaryPassword = false; - OfferToSaveLogins = false; - - # Remove Special Pages - OverrideFirstRunPage = ""; - OverridePostUpdatePage = ""; - - # Start Page - Homepage = { - StartPage = "previous-session"; - Locked = true; - }; - - # Home Page - FirefoxHome = { - Search = true; - TopSites = false; - SponsoredTopSites = false; - Highlights = false; - Pocket = false; - SponsoredPocket = false; - Snippets = false; - Locked = true; - }; - - # Search Suggestions - SearchSuggestEnabled = true; - FirefoxSuggest = { - WebSuggestions = false; - SponsoredSuggestions = false; - ImproveSuggest = false; - Locked = true; - }; - - # Save All on Shutdown - SanitizeOnShutdown = false; - - # Popups - PopupBlocking = { - Default = true; - Locked = true; - }; - - # Allow Bypasses - DisableSecurityBypass = { - InvalidCertificate = false; - SafeBrowsing = false; - }; - - # PictureInPicure - PictureInPicture = { - Enabled = true; - Locked = true; - }; - - # Topbar - SearchBar = "unified"; - DisplayMenuBar = "default-off"; - DisplayBookmarksToolbar = "newtab"; - NoDefaultBookmarks = true; - - # Miscellaneous - HttpsOnlyMode = "force_enabled"; - HardwareAcceleration = true; - DontCheckDefaultBrowser = true; - PromptForDownloadLocation = false; - PrivateBrowsingModeAvailability = 0; -} diff --git a/programs/firefox/policyExtensions.nix b/programs/firefox/policyExtensions.nix deleted file mode 100644 index 51d7e9d..0000000 --- a/programs/firefox/policyExtensions.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - # extensions to be auto downloaded into - # firefox - - # dont allow extensions to be installed though - # firefox, they must be described here! - "*".installation_mode = "blocked"; - - # uBlock Origin - "uBlock0@raymondhill.net" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; - installation_mode = "force_installed"; - }; - - # Bitwarden - "{446900e4-71c2-419f-a6a7-df9c091e268b}" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi"; - installation_mode = "force_installed"; - }; - - # User Agent Switcher - "user-agent-switcher@ninetailed.ninja" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/uaswitcher/latest.xpi"; - installation_mode = "force_installed"; - }; - - # SponsorBlock - "sponsorBlocker@ajay.app" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/sponsorblock/latest.xpi"; - installation_mode = "force_installed"; - }; - - # Privacy Badger - "jid1-MnnxcxisBPnSXQ@jetpack" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi"; - installation_mode = "force_installed"; - }; - - # FoxyProxy - "foxyproxy@eric.h.jung" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/foxyproxy-standard/latest.xpi"; - installation_mode = "force_installed"; - }; - - # Redirector - "redirector@einaregilsson.com" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/redirector/latest.xpi"; - installation_mode = "force_installed"; - }; - - # linkding - "{61a05c39-ad45-4086-946f-32adb0a40a9d}" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/linkding-extension/latest.xpi"; - installation_mode = "force_installed"; - }; - - # Bypass Paywalls Clean - "magnolia@12.34" = { - install_url = "https://f.freya.cat/xpi/bypass_paywalls_clean-4.1.4.0.xpi"; - installation_mode = "force_installed"; - }; -} diff --git a/programs/firefox/policyPrefs.nix b/programs/firefox/policyPrefs.nix deleted file mode 100644 index 73d2781..0000000 --- a/programs/firefox/policyPrefs.nix +++ /dev/null @@ -1,128 +0,0 @@ -let - # quick variables to specify - # locked true/false - lock-false = { - Value = false; - Status = "locked"; - }; - lock-true = { - Value = true; - Status = "locked"; - }; -in { - # about:config Preferences - # ... set policies that cannot be set using policies.json directly - - # allow userChrom.css - "toolkit.legacyUserProfileCustomizations.stylesheets" = lock-true; - - # dark theme - "extensions.activeThemeID" = { - Value = "firefox-compact-dark@mozilla.org"; - Status = "locked"; - }; - "layout.css.prefers-color-scheme.content-override" = { - Value = 0; - Status = "locked"; - }; - - # homepage - "browser.startup.homepage" = { - Value = "about:home"; - Status = "locked"; - }; - "browser.newtabpage.enabed" = lock-true; - "browser.newtabpage.url" = { - Value = "about:home"; - Status = "locked"; - }; - - # autofill - "browser.autofill.enabled" = lock-false; - "browser.formfill.enable" = lock-false; - - # search enable - "browser.urlbar.suggest.recentsearches" = lock-true; - "browser.urlbar.suggest.bookmark" = lock-true; - "browser.urlbar.suggest.clipboard" = lock-true; - "browser.urlbar.suggest.history" = lock-true; - - # search disable - "browser.urlbar.suggest.addons" = lock-false; - "browser.urlbar.suggest.calculator" = lock-false; - "browser.urlbar.suggest.engines" = lock-false; - "browser.urlbar.suggest.fakespot" = lock-false; - "browser.urlbar.suggest.mdn" = lock-false; - "browser.urlbar.suggest.openpage" = lock-false; - "browser.urlbar.suggest.pocket" = lock-false; - "browser.urlbar.suggest.remotetab" = lock-false; - "browser.urlbar.suggest.topsites" = lock-false; - "browser.urlbar.suggest.trending" = lock-false; - "browser.urlbar.suggest.weather" = lock-false; - "browser.urlbar.suggest.yelp" = lock-false; - - # privacy - "privacy.globalprivacycontrol.enabled" = lock-true; - - # security - "security.OCSP.enabled" = { - Value = 0; - Status = "locked"; - }; - "browser.contentblocking.category" = { - Value = "strict"; - Status = "locked"; - }; - "xpinstall.whitelist.required" = lock-true; - "signon.management.page.breach-alerts.enabled" = lock-false; - - # graphics - "dom.webgpu.enabled" = lock-true; - "media.eme.enabled" = lock-true; - - # user messaging - # ... disable shit that is annoying - "browser.newtabpage.activity-stream.feeds.section.topstories" = lock-false; - "browser.newtabpage.activity-stream.feeds.snippets" = lock-false; - "browser.newtabpage.activity-stream.section.highlights.includePocket" = lock-false; - "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = lock-false; - "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = lock-false; - "browser.newtabpage.activity-stream.section.highlights.includeVisited" = lock-false; - "browser.newtabpage.activity-stream.showSponsored" = lock-false; - "browser.newtabpage.activity-stream.system.showSponsored" = lock-false; - "browser.newtabpage.activity-stream.showSponsoredTopSites" = lock-false; - "browser.newtabpage.activity-stream.showWeather" = lock-false; - "browser.newtabpage.activity-stream.newtabWallpapers.enabled" = lock-false; - "browser.newtabpage.activity-stream.newtabWallpapers.v2.enabled" = lock-false; - "browser.newtabpage.activity-stream.default.sites" = { - Value = ""; - Status = "locked"; - }; - - # safebrowsing - "browser.safebrowsing.malware.enabled" = lock-true; - "browser.safebrowsing.phishing.enabled" = lock-true; - "browser.safebrowsing.downloads.enabled" = lock-true; - "browser.safebrowsing.downloads.remote.block_uncommon" = lock-false; - "browser.safebrowsing.downloads.remote.block_potentially_unwanted" = lock-false; - - # sidebar - "browser.tabs.inTitlebar" = { - Value = 0; - Status = "locked"; - }; - "browser.tabs.warnOnClose" = lock-true; - "browser.tabs.firefox-view" = lock-false; - "browser.tabs.closeTabByDblclick" = lock-true; - "ui.key.menuAccessKeyFocuses" = lock-false; - - # general settings - "general.autoScroll" = lock-false; - "general.smoothScroll" = lock-true; - "widget.gtk.overlay-scrollbars.enabled" = lock-false; - "accessibility.browsewithcaret" = lock-false; - "accessibility.typeaheadfind" = lock-false; - "media.hardwaremediakeys.enabled" = lock-true; - "browser.crashReports.unsubmittedCheck.autoSubmit2" = lock-false; - "browser.aboutConfig.showWarning" = lock-false; -} diff --git a/programs/firefox/userChrome.nix b/programs/firefox/userChrome.nix deleted file mode 100644 index ab93747..0000000 --- a/programs/firefox/userChrome.nix +++ /dev/null @@ -1,23 +0,0 @@ -'' - /* sidebar hack to flip contents the way i want them (arrows on the left) */ - #nav-bar-customization-target { - flex-direction: row-reverse; - } - - /* remove broken padding from sidebar hack */ - #unified-extensions-button { - padding-left: 0 !important; - } - - /* remove padding beside search bar */ - toolbarspring { - display: none !important; - } - - /* remove overflow menu and everything in it */ - #nav-bar-overflow-button, - #firefox-view-button, - #alltabs-button { - visibility: collapse; - } -'' diff --git a/programs/git/default.nix b/programs/git/default.nix deleted file mode 100644 index 5c6a73a..0000000 --- a/programs/git/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{config, ...}: { - home-manager.users.${config.user} = { - programs.git = { - enable = true; - userName = config.fullName; - userEmail = config.email; - - signing = { - format = "openpgp"; - key = "D9AF0A4209B7C2DE11A884BFACBC553660D9993D"; - signByDefault = true; - }; - - extraConfig = { - init.defaultBranch = "main"; - }; - }; - }; -} diff --git a/programs/gpg/default.nix b/programs/gpg/default.nix deleted file mode 100644 index 1aa145a..0000000 --- a/programs/gpg/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - keysDir = ../../files/keys; - keys = lib.attrsets.mapAttrsToList (name: type: "${keysDir}/${name}") (builtins.readDir keysDir); - gpgKeys = builtins.filter (path: lib.strings.hasSuffix "asc" path) keys; -in { - home-manager.users.${config.user} = { - # install keys into gpg keyring - programs.gpg = { - enable = true; - publicKeys = - map (path: { - source = path; - trust = 5; - }) - gpgKeys; - }; - - # global gpg agent - services.gpg-agent = { - enable = true; - enableExtraSocket = true; - enableSshSupport = true; - pinentry.package = pkgs.pinentry-curses; - }; - }; - - # yubikey support - services = { - pcscd.enable = true; - udev.packages = with pkgs; [ - yubikey-personalization - ]; - }; -} diff --git a/programs/hypr/default.nix b/programs/hypr/default.nix deleted file mode 100644 index 4a6bd01..0000000 --- a/programs/hypr/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{...}: { - imports = [ - ./hypridle.nix - ./hyprland.nix - ./hyprlock.nix - ./hyprpaper.nix - ]; -} diff --git a/programs/hypr/hypridle.nix b/programs/hypr/hypridle.nix deleted file mode 100644 index e481e74..0000000 --- a/programs/hypr/hypridle.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - config, - lib, - ... -}: { - home-manager.users.${config.user} = { - services.hypridle = { - enable = true; - - settings = { - general = { - lock_cmd = "pidof hyprlock || hyprlock"; - before_sleep_cmd = "loginctl lock-session"; - after_sleep_cmd = "hyprctl dispatch dpms on"; - ignore_dbus_inhibit = false; - }; - - listener = [ - # dim screen - { - timeout = 150; - on-timeout = "brightnessctl -s set 10"; - on-resume = "brightnessctl -r"; - } - # lock - { - timeout = 300; - on-timeout = "loginctl lock-session"; - } - # turn off screen - { - timeout = 350; - on-timeout = "hyprctl dispatch dpms off"; - on-resume = "hyprctl dispatch dpms on"; - } - ]; - }; - }; - }; -} diff --git a/programs/hypr/hyprland.nix b/programs/hypr/hyprland.nix deleted file mode 100644 index a37be7f..0000000 --- a/programs/hypr/hyprland.nix +++ /dev/null @@ -1,348 +0,0 @@ -{ - config, - pkgs, - lib, - inputs, - ... -}: let - system = pkgs.stdenv.hostPlatform.system; - hyprland = inputs.hyprland.packages.${system}; - hyprland-plugins = inputs.hyprland-plugins.packages.${system}; - hy3 = inputs.hy3.packages.${system}; - - fg = "rgb(${config.theme.colors.fg})"; - bg = "rgb(${config.theme.colors.bg})"; - primary = "rgb(${config.theme.colors.primary})"; - inactive = "rgb(${config.theme.colors.surface.bg})"; - - debug = false; -in { - environment = { - variables = { - HYPRLAND_TRACE = - if debug - then "1" - else "0"; - AQ_TRACE = - if debug - then "1" - else "0"; - - XDG_CURRENT_DESKTOP = "Hyprland"; - XDG_SESSION_TYPE = "wayland"; - XDG_SESSION_DESKTOP = "Hyprland"; - LIBSEAT_BACKEND = "logind"; - }; - sessionVariables = { - XCURSOR_THEME = "Adwaita"; - XCURSOR_SIZE = "24"; - - GTK_THEME = "Orchis-Teal-Dark"; - - MOZ_ENABLE_WAYLAND = "1"; - MOZ_USE_XINPUT = "1"; - _JAVA_AWT_WM_NONREPARENTING = "1"; - }; - }; - - xdg.portal = { - enable = true; - xdgOpenUsePortal = true; - config = { - common.default = ["gtk"]; - hyprland.default = ["gtk" "hyprland"]; - }; - extraPortals = [ - pkgs.xdg-desktop-portal-gtk - pkgs.xdg-desktop-portal-wlr - hyprland.xdg-desktop-portal-hyprland - ]; - }; - - programs.xwayland.enable = true; - - home-manager.users.${config.user} = { - wayland.windowManager.hyprland = { - enable = true; - package = hyprland.hyprland; - - xwayland.enable = true; - systemd.enable = true; - - # Plugins - plugins = [ - hyprland-plugins.hyprexpo - hy3.hy3 - ]; - - # Config - settings = { - # Debug - debug.disable_logs = ! debug; - debug.disable_time = ! debug; - debug.enable_stdout_logs = debug; - - # Monitors - monitor = - map ( - monitor: "${monitor.name}, highres, auto, ${toString monitor.scale}, bitdepth, ${toString monitor.bitdepth}" - ) - config.monitors; - - # Autostart - exec-once = config.autoRun; - - # General - general = { - gaps_in = config.theme.innerGap; - gaps_out = config.theme.outerGap; - layout = "hy3"; - resize_on_border = "yes"; - extend_border_grab_area = 20; - border_size = config.theme.borderWidth; - "col.active_border" = "${primary}"; - "col.inactive_border" = "${inactive}"; - }; - - # Gestures - gestures = { - workspace_swipe = true; - workspace_swipe_fingers = 3; - workspace_swipe_forever = true; - workspace_swipe_cancel_ratio = 0.15; - }; - - # Decoration - decoration = { - rounding = config.theme.outerRadius; - shadow.enabled = false; - blur = { - enabled = config.theme.blur; - size = 4; - passes = 2; - noise = 0.008; - contrast = 0.8916; - brightness = 0.8; - }; - }; - - # Animations - animations = { - enabled = true; - - bezier = [ - "windowIn, 0.06, 0.71, 0.25, 1" - "windowResize, 0.04, 0.67, 0.38, 1" - ]; - - animation = [ - "windowsIn, 1, 3, windowIn, slide #popin 20%" - "windowsOut, 1, 3, windowIn, slide #popin 70%" - "windowsMove, 1, 2.5, windowResize" - "border, 1, 10, default" - "borderangle, 1, 8, default" - "fade, 1, 3, default" - "workspaces, 1, 6, default" - "layers, 1, 5, windowIn, slide" - ]; - }; - - # Input - input = { - kb_layout = "us"; - kb_variant = ""; - kb_model = ""; - kb_options = "gtp:alt_shift_toggle, compose:ralt"; - kb_rules = ""; - follow_mouse = 1; - touchpad = { - natural_scroll = "yes"; - }; - sensitivity = 0; - }; - - # Keybinds - "$mod" = "SUPER"; - bind = [ - # Launch programs - - "$mod, W, exec, ${config.default.browser}" - "$mod, D, exec, ${config.default.appLauncher}" - "$mod, L, exec, ${config.default.lockScreen}" - "$mod, Return, exec, ${config.default.terminal}" - ", Print, exec, grimblast copy area" - - # Misc - - "$mod SHIFT, L, exit" - "$mod, tab, hyprexpo:expo, toggle" - - # Window operations - - "$mod SHIFT, Q, killactive" - "$mod SHIFT, SPACE, togglefloating" - "$mod, F, fullscreen" - "$mod, J, togglesplit" - - # Move focus with mod + arrow keys - - "$mod, left, movefocus, l" - "$mod, right, movefocus, r" - "$mod, up, movefocus, u" - "$mod, down, movefocus, d" - - # Move window across workspace with mod + arrow keys - - "$mod SHIFT, left, hy3:movewindow, l" - "$mod SHIFT, right, hy3:movewindow, r" - "$mod SHIFT, up, hy3:movewindow, u" - "$mod SHIFT, down, hy3:movewindow, d" - - # Switch workspaces with mod + [0-9] - - "$mod, 1, workspace, 1" - "$mod, 2, workspace, 2" - "$mod, 3, workspace, 3" - "$mod, 4, workspace, 4" - "$mod, 5, workspace, 5" - "$mod, 6, workspace, 6" - "$mod, 7, workspace, 7" - "$mod, 8, workspace, 8" - "$mod, 9, workspace, 9" - - # Move active window to a workspace with mod + SHIFT + [0-9] - - "$mod SHIFT, 1, movetoworkspacesilent, 1" - "$mod SHIFT, 2, movetoworkspacesilent, 2" - "$mod SHIFT, 3, movetoworkspacesilent, 3" - "$mod SHIFT, 4, movetoworkspacesilent, 4" - "$mod SHIFT, 5, movetoworkspacesilent, 5" - "$mod SHIFT, 6, movetoworkspacesilent, 6" - "$mod SHIFT, 7, movetoworkspacesilent, 7" - "$mod SHIFT, 8, movetoworkspacesilent, 8" - "$mod SHIFT, 9, movetoworkspacesilent, 9" - "$mod SHIFT, 0, movetoworkspacesilent, 10" - - # Move to tab - - "LALT, 1, hy3:focustab, index, 01" - "LALT, 2, hy3:focustab, index, 02" - "LALT, 3, hy3:focustab, index, 03" - "LALT, 4, hy3:focustab, index, 04" - "LALT, 5, hy3:focustab, index, 05" - "LALT, 6, hy3:focustab, index, 06" - "LALT, 7, hy3:focustab, index, 07" - "LALT, 8, hy3:focustab, index, 08" - "LALT, 9, hy3:focustab, index, 09" - "LALT, 0, hy3:focustab, index, 10" - - "$mod SHIFT, B, hy3:makegroup, h" - "$mod SHIFT, V, hy3:makegroup, v" - "$mod SHIFT, C, hy3:changegroup, toggletab" - - # Scroll through existing workspaces with mod + scroll - - "$mod, mouse_down, workspace, e+1" - "$mod, mouse_up, workspace, e-1" - ]; - - bindn = [ - # Focus windows with scroll wheel or middle click - - ", mouse:272, hy3:focustab, mouse" - ", mouse_down, hy3:focustab, l, require_hovered" - ", mouse_up, hy3:focustab, r, require_hovered" - ]; - - bindm = [ - # Move/resize windows with mod + LMB/RMB and dragging - - "$mod, mouse:272, movewindow" - "$mod, mouse:273, resizewindow" - ]; - - binde = [ - # Audio - - # raise volume - ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+" - # lower volume - ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" - # mute speaker - ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" - # mute mic - ", XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle" - - # Media - - # play - ", XF86AudioPlay, exec, playerctl play-pause" - # next - ", XF86AudioNext, exec, playerctl next" - # prev - ", XF86AudioPrev, exec, playerctl previous" - - # Backlight - - ", XF86MonBrightnessDown, exec, brightnessctl set 5%-" - ", XF86MonBrightnessUp, exec, brightnessctl set 5%+" - ]; - - # Plugin configuration - plugin = { - # hy3 - hy3 = { - tabs = { - height = 24; - text_height = 9; - text_padding = 10; - padding = 2; - render_text = true; - text_font = "monospace"; - radius = config.theme.outerRadius; - border_width = config.theme.borderWidth; - - "col.active" = "${bg}"; - "col.active.border" = "${inactive}"; - "col.active.text" = "${fg}"; - "col.inactive" = "${bg}"; - "col.inactive.border" = "${inactive}"; - "col.inactive.text" = "${fg}"; - }; - - autotile = { - enable = true; - }; - }; - }; - - # XWayland - xwayland = { - force_zero_scaling = "true"; - use_nearest_neighbor = "false"; - }; - - # Misc - misc = { - disable_hyprland_logo = true; - disable_splash_rendering = true; - key_press_enables_dpms = true; - mouse_move_enables_dpms = true; - enable_anr_dialog = false; - vrr = 1; - }; - - # Ecosystem - ecosystem = { - no_update_news = true; - no_donation_nag = true; - }; - - # Experimental - experimental = { - xx_color_management_v4 = true; - }; - }; # end settings - }; # end hyprland - }; # end home-manager -} diff --git a/programs/hypr/hyprlock.nix b/programs/hypr/hyprlock.nix deleted file mode 100644 index 130f379..0000000 --- a/programs/hypr/hyprlock.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - config, - lib, - ... -}: let - fg = "rgb(${config.theme.colors.fg})"; - bg = "rgb(${config.theme.colors.bg})"; - error = "rgb(${config.theme.colors.error})"; - trans = "rgba(0,0,0,0)"; -in { - default.lockScreen = lib.mkDefault "hyprlock"; - - home-manager.users.${config.user} = { - programs.hyprlock = { - enable = true; - - settings = { - background = { - path = config.theme.lockscreen; - color = bg; - blur_passes = 0; - blur_size = 2; - noise = 0; - contrast = 0; - brightness = 0; - vibrancy = 0; - vibrancy_darkness = 0.0; - }; - - # Password Input - input-field = { - size = "300, 30"; - outline_thickness = 0; - dots_size = 0.25; - dots_spacing = 0.55; - dots_center = true; - dots_rounding = -1; - outer_color = trans; - inner_color = trans; - font_color = fg; - fade_on_empty = false; - placeholder_text = "Enter Password"; - hide_input = false; - check_color = error; - fail_color = error; - capslock_color = -1; - numlock_color = -1; - bothlock_color = -1; - invert_numlock = false; - swap_font_color = false; - font_family = config.theme.font.regular; - position = "0, 50"; - halign = "center"; - valign = "bottom"; - }; - - label = [ - # Date - { - text = "cmd[update:1000] echo \"$(date +\"%A, %B %d\")\""; - color = fg; - font_size = 20; - font_family = config.theme.font.header; - position = "0, -100"; - halign = "center"; - valign = "top"; - } - # Clock - { - text = "cmd[update:1000] echo \"$(date +\"%k:%M:%S\")\""; - color = fg; - font_size = 90; - font_family = config.theme.font.header; - position = "0, -130"; - halign = "center"; - valign = "top"; - } - ]; - }; - }; - }; -} diff --git a/programs/hypr/hyprpaper.nix b/programs/hypr/hyprpaper.nix deleted file mode 100644 index 13641b7..0000000 --- a/programs/hypr/hyprpaper.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - config, - lib, - ... -}: { - home-manager.users.${config.user} = { - services.hyprpaper = { - enable = true; - - settings = { - preload = config.theme.wallpaper; - wallpaper = ",${config.theme.wallpaper}"; - splash = false; - }; - }; - }; -} diff --git a/programs/kitty/default.nix b/programs/kitty/default.nix deleted file mode 100644 index eac223b..0000000 --- a/programs/kitty/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ - config, - lib, - ... -}: { - default.terminal = lib.mkDefault "kitty"; - - home-manager.users.${config.user} = { - programs.kitty = { - enable = true; - environment = {}; - extraConfig = ""; - - settings = { - # Font - font_family = config.theme.font.monospace; - font_size = 11; - bold_font = "auto"; - italic_font = "auto"; - bold_italic_font = "auto"; - - # Scrollback - scrollback_lines = 10000; - scrollback_pager_history_size = 300; # MB - - # Urls - detect_urls = true; - show_hyperlink_targets = false; - - # Window - window_padding_width = config.theme.outerGap; - window_border_width = 0; - draw_minimal_borders = true; - background_opacity = config.theme.opacity; - - # Disable audio - enable_audio_bell = false; - - # Disable close prompt - confirm_os_window_close = 0; - - # colors - background = "#${config.theme.colors.bg}"; - foreground = "#${config.theme.colors.fg}"; - selection_background = "#${config.theme.colors.surface.bg}"; - selection_foreground = "#${config.theme.colors.surface.fg}"; - url_color = "#${config.theme.colors.bright.yellow}"; - cursor = "#${config.theme.colors.fg}"; - active_border_color = "#${config.theme.colors.primary}"; - inactive_border_color = "#${config.theme.colors.bg}"; - active_tab_background = "#${config.theme.colors.bg}"; - active_tab_foreground = "#${config.theme.colors.fg}"; - inactive_tab_background = "#${config.theme.colors.bg}"; - inactive_tab_foreground = "#${config.theme.colors.fg}"; - tab_bar_background = "#${config.theme.colors.bg}"; - - # normal - color0 = "#${config.theme.colors.normal.black}"; - color1 = "#${config.theme.colors.normal.red}"; - color2 = "#${config.theme.colors.normal.green}"; - color3 = "#${config.theme.colors.normal.yellow}"; - color4 = "#${config.theme.colors.normal.blue}"; - color5 = "#${config.theme.colors.normal.magenta}"; - color6 = "#${config.theme.colors.normal.cyan}"; - color7 = "#${config.theme.colors.normal.white}"; - - # bright - color8 = "#${config.theme.colors.bright.black}"; - color9 = "#${config.theme.colors.bright.red}"; - color10 = "#${config.theme.colors.bright.green}"; - color11 = "#${config.theme.colors.bright.yellow}"; - color12 = "#${config.theme.colors.bright.blue}"; - color13 = "#${config.theme.colors.bright.magenta}"; - color14 = "#${config.theme.colors.bright.cyan}"; - color15 = "#${config.theme.colors.bright.white}"; - }; - }; - }; -} diff --git a/programs/mako/default.nix b/programs/mako/default.nix deleted file mode 100644 index 94b0cd9..0000000 --- a/programs/mako/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - config, - lib, - ... -}: { - home-manager.users.${config.user} = { - services.mako = { - enable = false; # now using astal - - settings = { - font = "${config.theme.font.monospace} 11"; - - margin = toString config.theme.outerGap; - padding = toString config.theme.innerGap; - - background-color = "#${config.theme.colors.bg}"; - progress-color = "#${config.theme.colors.primary}"; - text-color = "#${config.theme.colors.fg}"; - - border-color = "#${config.theme.colors.fg}"; - border-size = config.theme.borderWidth; - border-radius = config.theme.outerRadius; - - default-timeout = 5000; - layer = "overlay"; - icons = true; - }; - }; - }; -} diff --git a/programs/neovim/config.nix b/programs/neovim/config.nix deleted file mode 100644 index ae10243..0000000 --- a/programs/neovim/config.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - config, - inputs, -}: -inputs.self.lib.lua.fmt { - # Width of tabs in the editor - tabwidth = 4; - # If tabs should be expanded to spaces - expandtab = false; - keys = { - # NeoVIM leader key - leader = " "; - # Keybind to remove active hilighted content - noh = "h"; - menus = { - # Open file browser - browser = "e"; - # Show active buffers - buffers = "fb"; - # Show LSP errors - error = "t"; - # Find files in working directory - find = "ff"; - # Grep files in working directory - grep = "fg"; - # Search help menu - help = "fh"; - # Voew undo tree - undo = "u"; - }; - lsp = { - # Open LSP hover menu on a value - hover = "K"; - # Perform an LSP action on a value - action = "la"; - # View all references of a value - references = "lr"; - # Rename current and all references of a value - rename = "ln"; - }; - cmp = { - # Select previous value in completion engine - prev = ""; - # Select next value in completion engine - next = ""; - # Confirm current value in completion engine - confirm = ""; - # Auto complete using completion engine - complete = ""; - }; - }; - # list of lsp servers to load - lsps = { - clangd = {}; - jdtls = {}; - kotlin_language_server = {}; - phpactor = {}; - rust_analyzer = {}; - ts_ls = {}; - zls = {}; - }; - highlight = { - # max file size in KiB to attempt to parse - max_size = 1024; - }; - # colorscheme - theme = { - colors = { - base00 = "#${config.theme.colors.bg}"; - base01 = "#${config.theme.colors.surface.bg}"; - base02 = "#${config.theme.colors.surface.bg}"; - base03 = "#${config.theme.colors.bright.white}"; - base04 = "#${config.theme.colors.bright.black}"; - base05 = "#${config.theme.colors.fg}"; - base06 = "#${config.theme.colors.bright.white}"; - base07 = "#${config.theme.colors.hover.bg}"; - base08 = "#${config.theme.colors.bright.red}"; - base09 = "#${config.theme.colors.bright.yellow}"; - base0A = "#${config.theme.colors.bright.yellow}"; - base0B = "#${config.theme.colors.bright.green}"; - base0C = "#${config.theme.colors.bright.cyan}"; - base0D = "#${config.theme.colors.bright.blue}"; - base0E = "#${config.theme.colors.bright.magenta}"; - base0F = "#${config.theme.colors.normal.yellow}"; - }; - transparent = true; - }; - # max column width - col = { - # show a bar at `width` characters - show = true; - width = 80; - }; -} diff --git a/programs/neovim/default.nix b/programs/neovim/default.nix deleted file mode 100644 index c1ed000..0000000 --- a/programs/neovim/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - inputs, - config, - lib, - pkgs, - ... -}: let - lua_cfg = import ./config.nix {inherit config inputs;}; - lua = builtins.readFile ./init.lua; -in { - environment.variables.EDITOR = "nvim"; - - home-manager.users.${config.user} = { - programs.neovim = { - enable = true; - viAlias = true; - vimAlias = true; - - extraLuaConfig = '' - local config = ${lua_cfg} - - ${lua} - ''; - - plugins = with pkgs.vimPlugins; [ - # Dependencies - vim-devicons - nvim-web-devicons - plenary-nvim - # Colorscheme - base16-nvim - # Mode line - lualine-nvim - # Buffer line - bufferline-nvim - # File browser - nvim-tree-lua - # Undo tree - undotree - # Trouble (error menu) - trouble-nvim - # Telescope (buffers/find/grep/help) - telescope-nvim - # Snippets - vim-vsnip - vim-vsnip-integ - friendly-snippets - # Completion - cmp-buffer - cmp-nvim-lsp - cmp-vsnip - nvim-cmp - # Sourround delimiters - nvim-surround - # Comment functions - nerdcommenter - # Treesitter - nvim-treesitter.withAllGrammars - # Syntax hilighting - vim-illuminate - # Todo comments - todo-comments-nvim - # Lsp server - nvim-lspconfig - # Notifications - fidget-nvim - # Auto indentation - indent-o-matic - # 80 column width - virt-column-nvim - ]; - }; - }; -} diff --git a/programs/neovim/init.lua b/programs/neovim/init.lua deleted file mode 100644 index 2be7fee..0000000 --- a/programs/neovim/init.lua +++ /dev/null @@ -1,359 +0,0 @@ ---[[ - - NeoVIM Configuration - Copyright (c) Freya Murphy 2025 - -]]-- - ---[[ LIB ]]-- - -local function bind(key, action, opts) - opts = opts or {} - vim.keymap.set('n', key, action, opts) -end - -local function join(left, right) - if not left then return right end - if not right then return left end - for k,v in pairs(right) do - local lv, rv = left[k], right[k] - if type(rv) == "table" then - left[k] = join(lv, rv) - else - left[k] = rv - end - end - return left -end - ---[[ VIM ]]-- - -vim.opt.tabstop = config.tabwidth -vim.opt.softtabstop = config.tabwidth -vim.opt.shiftwidth = config.tabwidth -vim.opt.expandtab = config.expandtab -vim.opt.mouse = "a" -vim.opt.clipboard = "unnamedplus" -vim.opt.hlsearch = true -vim.opt.autoindent = true -vim.opt.ttyfast = true -vim.opt.number = true -vim.opt.relativenumber = true -vim.opt.rnu = true -vim.opt.swapfile = false -vim.opt.fillchars = { eob = " "} - - ---[[ BUF ]]-- - --- remove trailing whitespace on save -vim.api.nvim_create_autocmd({ "BufWritePre" }, { - pattern = { "*" }, - command = [[%s/\s\+$//e]], -}) - ---[[ KEYBINDS ]]-- - --- leader -vim.g.mapleader = config.keys.leader -vim.g.maplocalleader = config.keys.leader -vim.keymap.set("", '', '', { noremap = true, silent = true }) - --- lsp -bind(config.keys.noh, vim.cmd.noh) -vim.api.nvim_create_autocmd('LspAttach', { - desc = 'LSP actions', - callback = function(event) - local opts = {buffer = event.buf} - bind(config.keys.lsp.hover, function() vim.lsp.buf.hover() end, opts) - bind(config.keys.lsp.action, function() vim.lsp.buf.code_action() end, opts) - bind(config.keys.lsp.references, function() vim.lsp.buf.references() end, opts) - bind(config.keys.lsp.rename, function() vim.lsp.buf.rename() end, opts) - end -}) - ---[[ COLORSCHEME ]]-- - -vim.opt.termguicolors = true -if config.theme.transparent then - vim.g.base16_transparent_background = 1 -end - -local colorscheme = require('base16-colorscheme') -colorscheme.setup({ - base00 = config.theme.colors.base00, - base01 = config.theme.colors.base01, - base02 = config.theme.colors.base02, - base03 = config.theme.colors.base03, - base04 = config.theme.colors.base04, - base05 = config.theme.colors.base05, - base06 = config.theme.colors.base06, - base07 = config.theme.colors.base07, - base08 = config.theme.colors.base08, - base09 = config.theme.colors.base09, - base0A = config.theme.colors.base0A, - base0B = config.theme.colors.base0B, - base0C = config.theme.colors.base0C, - base0D = config.theme.colors.base0D, - base0E = config.theme.colors.base0E, - base0F = config.theme.colors.base0F, -}) - --- make transparent background -if config.theme.transparent then - local colors = { - -- Text - "Normal", "NormalNC", "NormalFloat", - -- Line Numbers - "LineNr", "EndOfBuffer", "SignColumn", - -- Floating - "FloatBorder", - -- Mode/Buffer Lines - "TabLine", "TabLineFill", "StatusLine", - } - for _,color in pairs(colors) do - vim.api.nvim_set_hl(0, color, { bg = "none" }) - end -end --- identifiers should not be colored -vim.api.nvim_set_hl(0, "Identifier", { fg = config.theme.colors.base05 }) -vim.api.nvim_set_hl(0, "TSVariable", { fg = config.theme.colors.base05 }) --- macro should be colored as a keyword -vim.api.nvim_set_hl(0, "TSFuncMacro", { fg = config.theme.colors.base0E }) --- comments are too dark -vim.api.nvim_set_hl(0, "Comment", { fg = config.theme.colors.base07 }) -vim.api.nvim_set_hl(0, "@comment", { link = "Comment" }) - ---[[ MODE LINE ]]-- - -local lualine_theme = require('lualine.themes.base16') -if config.theme.transparent then - lualine_theme.normal.c = { fg = config.theme.colors.base05, bg = "none" } -end - -require('lualine').setup { - options = { - theme = lualine_theme, - icons_enabled = true, - globalstatus = true, - }, -} - ---[[ BUFFER LINE ]]-- - -require('bufferline').setup {} - ---[[ FILE BROWSER ]]-- - -vim.g.loaded_netrw = 1 -vim.g.loaded_netrwPlugin = 1 - -require('nvim-tree').setup { - sort = { - sorter = "case_sensitive", - }, - view = { - centralize_selection = true, - signcolumn = "yes", - float = { - enable = true, - quit_on_focus_loss = true, - open_win_config = { - relative = "editor", - border = "rounded", - width = 80, - height = 30, - row = 1, - col = 1, - }, - } - }, - renderer = { - group_empty = true, - }, - actions = { - use_system_clipboard = true, - change_dir = { - enable = true, - global = false, - restrict_above_cwd = false, - }, - expand_all = { - max_folder_discovery = 300, - exclude = {}, - }, - file_popup = { - open_win_config = { - col = 1, - row = 1, - relative = "cursor", - border = "shadow", - style = "minimal", - }, - }, - open_file = { - quit_on_open = true, - window_picker = { - enable = false, - picker = "default", - chars = "abcdefghijklmnopqrstuvwxyz1234567890", - exclude = { - filetype = { "notify", "lazy", "qf", "diff", "fugitive", "fugitiveblame" }, - buftype = { "nofile", "terminal", "help" }, - }, - }, - }, - remove_file = { - close_window = true, - }, - }, - filters = { - dotfiles = false, - }, - tab = { - sync = { - open = false, - close = false, - ignore = {}, - }, - }, - git = { - enable = false, - }, - update_cwd = true, - respect_buf_cwd = true, - update_focused_file = { - enable = true, - update_cwd = true - }, -} - -bind(config.keys.menus.browser, vim.cmd.NvimTreeToggle) - ---[[ UNDO TREE ]]-- - -bind(config.keys.menus.undo, vim.cmd.UndotreeToggle) - ---[[ ERROR MENU ]]-- - -bind(config.keys.menus.error, function() require('trouble').toggle() end) - ---[[ TELESCOPE ]]-- - -local telescope = require('telescope.builtin') -bind(config.keys.menus.buffers, telescope.buffers) -bind(config.keys.menus.find, telescope.find_files) -bind(config.keys.menus.grep, telescope.live_grep) -bind(config.keys.menus.help, telescope.help_tags) -if config.theme.transparent then - vim.api.nvim_set_hl(0, 'TelescopeNormal', { bg = "none" }) - vim.api.nvim_set_hl(0, 'TelescopeBorder', { bg = "none" }) - vim.api.nvim_set_hl(0, 'TelescopeResultsTitle', { bg = "none" }) - vim.api.nvim_set_hl(0, 'TelescopePromptTitle', { bg = "none" }) - vim.api.nvim_set_hl(0, 'TelescopePreviewTitle', { bg = "none" }) - vim.api.nvim_set_hl(0, 'TelescopePromptNormal', { bg = "none" }) - vim.api.nvim_set_hl(0, 'TelescopePromptBorder', { bg = "none" }) -end - ---[[ COMPLETION ]]-- - -local cmp = require('cmp') -local cmp_select = {behavior = cmp.SelectBehavior.select} -local cmp_mappings = cmp.mapping.preset.insert({ - [config.keys.cmp.prev] = cmp.mapping.select_prev_item(cmp_select), - [config.keys.cmp.next] = cmp.mapping.select_next_item(cmp_select), - [config.keys.cmp.confirm] = cmp.mapping.confirm({ select = true }), - [config.keys.cmp.complete] = cmp.mapping.complete(), -}) - -cmp_mappings[''] = nil -cmp_mappings[''] = nil - -cmp.setup { - snippet = { - expand = function(args) - vim.fn["vsnip#anonymous"](args.body) - end, - }, - sources = cmp.config.sources { - { name = 'nvim_lsp' }, - { name = 'vsnip' }, - { name = 'buffer' }, - }, - mapping = cmp_mappings, -} - ---[[ Surround Delimiters ]]-- - -require('nvim-surround').setup {} - ---[[ SYNTAX HIGHLIGHTING ]]-- - -require('nvim-treesitter.configs').setup { - highlight = { - enable = true, - disable = function(lang, buf) - local max_filesize = config.highlight.max_size * 1024 - local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf)) - if ok and stats and stats.size > max_filesize then - return true - end - end, - additional_vim_regex_highlighting = true, - }, -} - -require('illuminate').configure { - providers = { - 'lsp', - 'treesitter', - 'regex', - }, -} - ---[[ TODO COMMENTS ]]-- - -require('todo-comments').setup() - ---[[ LSP SERVER ]]-- - -local lspconfig = require('lspconfig') -local capabilities = require('cmp_nvim_lsp').default_capabilities() - -for lsp,config in pairs(config.lsps) do - local config = join(capabilities, config) - lspconfig[lsp].setup { - capabilities = config, - } -end - -vim.diagnostic.config({ - virtual_lines = true, -}) - ---[[ NOTIFICATIONS ]]-- - -require('fidget').setup { - notification = { - window = { - winblend = 0, - }, - }, -} - ---[[ AUTO INDENTATION ]]-- - -require('indent-o-matic').setup { - max_lines = 2048, - standard_widths = { 2, 4, 8 }, - skip_multiline = true, -} - ---[[ 80 COLUMN WIDTH ]]-- - -if config.col.show then - require('virt-column').setup { - enabled = true, - virtcolumn = tostring(config.col.width), - } -end diff --git a/programs/ssh/config b/programs/ssh/config deleted file mode 100644 index 5ae97b6..0000000 --- a/programs/ssh/config +++ /dev/null @@ -1,12 +0,0 @@ -Match Host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye" - -Host *.in.freya.cat cid.freya.cat alivemc.net - User root - -Host *.cs.rit.edu - User tam2214 - -Host * - HostkeyAlgorithms +ssh-rsa - PubkeyAcceptedKeyTypes +ssh-rsa - KexAlgorithms -sntrup761x25519-sha512@openssh.com diff --git a/programs/ssh/default.nix b/programs/ssh/default.nix deleted file mode 100644 index b6ecb1d..0000000 --- a/programs/ssh/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - config, - lib, - ... -}: { - # ssh config - home-manager.users.${config.user} = { - programs.ssh = { - enable = true; - extraConfig = lib.fileContents ./config; - }; - }; - - # sshd - services.openssh = { - enable = true; - ports = [22]; - settings = { - PasswordAuthentication = false; - KbdInteractiveAuthentication = false; - UseDns = true; - X11Forwarding = false; - PermitRootLogin = "no"; - }; - }; - - # allow ssh port - networking.firewall.allowedTCPPorts = [22]; - - # ban evil - services.fail2ban = { - enable = true; - ignoreIP = [ - # freyanet - "10.0.0.0/14" - ]; - }; - - # add authorized keys - users.users.${config.user} = { - openssh.authorizedKeys.keyFiles = [ - ../../files/keys/ssh.pub - ]; - }; -} diff --git a/programs/starship/default.nix b/programs/starship/default.nix deleted file mode 100644 index 74fd28a..0000000 --- a/programs/starship/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - config, - lib, - ... -}: { - home-manager.users.${config.user} = { - programs.starship = { - enable = true; - - settings = { - format = lib.concatStrings [ - "╭─ " - "$username" - "$hostname" - "$git_branch" - "$directory" - "$line_break" - "╰─ " - ]; - - username = { - style_user = "bold cyan"; - style_root = "bold red"; - format = "[$user]($style) "; - disabled = false; - show_always = true; - }; - - hostname = { - ssh_only = false; - format = "on [$hostname](bold blue) "; - disabled = false; - }; - - directory = { - format = "[$path]($style)[$read_only]($read_only_style) "; - truncation_length = -1; - truncate_to_repo = false; - truncation_symbol = "…/"; - }; - - git_branch = { - style = "bold purple"; - format = "at [$symbol$branch(:$remote_branch)]($style) "; - }; - }; - }; - }; -} diff --git a/programs/steam/default.nix b/programs/steam/default.nix deleted file mode 100644 index 65deeaa..0000000 --- a/programs/steam/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{lib, ...}: { - nixpkgs.config.allowUnfreePredicate = pkg: - builtins.elem (lib.getName pkg) [ - "steam" - "steam-original" - "steam-runtime" - ]; - - programs.gamescope = { - enable = true; - capSysNice = true; - }; - - programs.steam = { - enable = true; - remotePlay.openFirewall = true; - dedicatedServer.openFirewall = true; - localNetworkGameTransfers.openFirewall = true; - gamescopeSession.enable = true; - }; - - # controllers - hardware.xone.enable = true; - hardware.steam-hardware.enable = true; -} diff --git a/programs/talc/default.nix b/programs/talc/default.nix deleted file mode 100644 index 92ba578..0000000 --- a/programs/talc/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - config, - pkgs, - inputs, - ... -}: let - system = pkgs.stdenv.hostPlatform.system; - talc = inputs.talc.packages.${system}; -in { - home-manager.users.${config.user} = { - home.packages = [ - talc.talc - ]; - }; -} diff --git a/programs/tmux/default.nix b/programs/tmux/default.nix deleted file mode 100644 index c7ce7db..0000000 --- a/programs/tmux/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - config, - pkgs, - ... -}: { - home-manager.users.${config.user} = { - home.packages = [ - pkgs.tmux - ]; - - home.file = { - ".tmux.conf".source = ./tmux.conf; - ".local/bin/tmux_window".source = ./tmux_window; - }; - }; -} diff --git a/programs/tmux/tmux.conf b/programs/tmux/tmux.conf deleted file mode 100644 index 31ac742..0000000 --- a/programs/tmux/tmux.conf +++ /dev/null @@ -1,105 +0,0 @@ - -# change prefix -set -g prefix C-a -unbind C-b -bind C-a send-prefix - -# split windows like vim -# vim's definition of a horizontal/vertical split is reversed from tmux's -bind s split-window -v -bind v split-window -h - -# split panes using | and - -bind - split-window -v -bind | split-window -h -unbind '"' -unbind % - -# reload config file -bind r source-file ~/.tmux.conf - -# large history -set -g history-limit 10000 - -# start windows and panes at 1, not 0 -set -g base-index 1 -setw -g pane-base-index 1 - -# switch term -bind 1 run-shell "tmux_window 1" -bind 2 run-shell "tmux_window 2" -bind 3 run-shell "tmux_window 3" -bind 4 run-shell "tmux_window 4" -bind 5 run-shell "tmux_window 5" -bind 6 run-shell "tmux_window 6" -bind 7 run-shell "tmux_window 7" -bind 8 run-shell "tmux_window 8" -bind 9 run-shell "tmux_window 9" -bind 0 run-shell "tmux_window 10" -bind S choose-tree - -# terminal style -set -g default-terminal "tmux-256color" -set -g terminal-overrides "*:colors=256" -set -a terminal-features "xterm-kitty:RGB" - -# focus events -set -g focus-events on - -# move around panes with hjkl, as one would in vim after pressing ctrl-w -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 - -# enable mouse control -set -g mouse on - -# don't rename windows automatically -set-option -g allow-rename off - -# don't do anything when a 'bell' rings -set -g visual-activity off -set -g visual-bell off -set -g visual-silence off -setw -g monitor-activity off -set -g bell-action none - -# clock mode -setw -g clock-mode-colour yellow - -# copy mode -setw -g mode-style 'fg=black bg=red bold' -setw -g mode-keys vi - -# panes -set -g pane-border-style 'fg=red' -set -g pane-active-border-style 'fg=yellow' - -# statusbar -set -g status-position bottom -set -g status-justify left -set -g status-style 'fg=blue' -set -g status-interval 1 - -set -g status-left '' -set -g status-left-length 10 - -set -g status-right-style 'fg=black bg=blue' -set -g status-right '%Y-%m-%d %H:%M:%S ' -set -g status-right-length 50 - -setw -g window-status-current-style 'fg=black bg=blue' -setw -g window-status-current-format ' #I #W #F ' - -setw -g window-status-style 'fg=blue bg=black' -setw -g window-status-format ' #I #[fg=white]#W #[fg=blue]#F ' - -setw -g window-status-bell-style 'fg=blue bg=red bold' - -# messages -set -g message-style 'fg=yellow bg=red bold' - -# bind : to command-prompt like vim -# this is the default in tmux already -bind : command-prompt diff --git a/programs/tmux/tmux_window b/programs/tmux/tmux_window deleted file mode 100755 index 1cdacf0..0000000 --- a/programs/tmux/tmux_window +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if tmux list-windows | grep -q "^$1:"; then - tmux select-window -t "$1" -else - tmux new-window -t "$1" -fi diff --git a/programs/unofficial-homestuck-collection/default.nix b/programs/unofficial-homestuck-collection/default.nix deleted file mode 100644 index 834bc5c..0000000 --- a/programs/unofficial-homestuck-collection/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - config, - pkgs, - inputs, - ... -}: let - system = pkgs.stdenv.hostPlatform.system; - unofficial-homestuck-collection = inputs.self.packages.${system}; -in { - home-manager.users.${config.user} = { - home.packages = [ - unofficial-homestuck-collection.unofficial-homestuck-collection - ]; - }; -} diff --git a/programs/waybar/default.nix b/programs/waybar/default.nix deleted file mode 100644 index 7602a82..0000000 --- a/programs/waybar/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - config, - lib, - ... -}: { - home-manager.users.${config.user} = { - programs.waybar = { - enable = false; # using astal now - - settings = [ - { - height = 24; - layer = "top"; - position = "top"; - spacing = 4; - - modules-left = [ - "hyprland/workspaces" - ]; - modules-center = [ - "clock" - ]; - modules-right = [ - "battery" - "wireplumber" - "network" - "tray" - ]; - - "hyprland/workspaces" = { - disable-scroll = true; - all-outputs = true; - format = "{name}"; - }; - - battery = { - interval = 1; - states = { - warning = 30; - critical = 15; - }; - format = " {capacity}%"; - format-charging = " {capacity}%"; - format-plugged = " {capacity}%"; - format-full = " {capacity}%"; - format-warning = " {capacity}%"; - format-critical = " {capacity}%"; - }; - - wireplumber = { - format = " {volume}%"; - format-bluetooth = " {volume}%"; - format-muted = " muted"; - scroll-step = 1; - on-click = "pavucontrol"; - ignored-sinks = ["Easy Effects Sink"]; - }; - - network = { - format = " disconnected"; - format-wifi = " {essid}"; - format-ethernet = " {ipaddr}/{cidr}"; - format-disconnected = " disconnected"; - max-length = 50; - on-click = "nm-connection-editor"; - }; - - clock = { - interval = 1; - format = "{:%Y-%m-%d %a %H:%M:%S}"; - }; - - tray = { - spacing = config.theme.outerGap; - }; - } - ]; - - style = import ./style.nix {theme = config.theme;}; - }; - }; -} diff --git a/programs/waybar/style.nix b/programs/waybar/style.nix deleted file mode 100644 index 33db673..0000000 --- a/programs/waybar/style.nix +++ /dev/null @@ -1,108 +0,0 @@ -{theme}: let - fg = "#${theme.colors.fg}"; - bg = "#${theme.colors.bg}"; - surface-fg = "#${theme.colors.surface.fg}"; - surface-bg = "#${theme.colors.surface.bg}"; - primary = "#${theme.colors.primary}"; - success = "#${theme.colors.success}"; - warning = "#${theme.colors.warning}"; - error = "#${theme.colors.error}"; - fontSize = "${toString theme.font.size}px"; - outerGap = "${toString theme.outerGap}px"; - innerGap = "${toString theme.innerGap}px"; - outerRadius = "${toString theme.outerRadius}px"; - innerRadius = "${toString theme.innerRadius}px"; - borderWidth = "${toString theme.borderWidth}px"; -in '' - /** Base */ - - * { - all: unset; - } - - window#waybar { - font-family: "${theme.font.regular}", "${theme.font.icon}", "${theme.font.monospace}"; - font-size: ${fontSize}; - color: ${fg}; - background-color: ${bg}; - } - - /** Workspaces */ - - #workspaces { - margin-left: ${outerGap}; - } - - #workspaces button { - border-radius: ${innerRadius}; - margin: 4px 2px; - padding: 0px 7px; - background: ${surface-bg}; - color: ${surface-fg}; - } - - #workspaces button.focused, - #workspaces button.active { - background: ${primary}; - color: ${bg}; - } - - #workspaces button.urgent { - background: ${error}; - } - - /** Tray */ - - #tray { - border: none; - margin-right: ${outerGap}; - } - - #tray > .passive { - -gtk-icon-effect: dim; - } - - #tray > .needs-attention { - -gtk-icon-effect: highlight; - } - - /** Right modules */ - - #battery, - #wireplumber, - #network { - padding: 0 ${outerGap}; - } - - /** Battery */ - - #battery.charging { - color: ${success}; - } - - #battery.warning:not(.charging) { - color: ${warning}; - } - - #battery.critical:not(.charging) { - color: ${error}; - } - - /** Wireplumber */ - - #wireplumber.muted { - color: ${error}; - } - - /** Network */ - - #network.wifi, - #network.ethernet { - color: ${success}; - } - - #network.disconnected { - color: ${error}; - } - -'' diff --git a/programs/wofi/default.nix b/programs/wofi/default.nix deleted file mode 100644 index add0c26..0000000 --- a/programs/wofi/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - config, - lib, - ... -}: { - #default.appLauncher = lib.mkDefault "wofi --show drun --prompt 'Seach Programs'"; - - home-manager.users.${config.user} = { - programs.wofi = { - enable = true; - - settings = { - key_expand = "Tab"; - term = "kitty"; - matching = "multi-contains"; - insensitive = true; - gtk_dark = true; - hide_scroll = true; - }; - - style = import ./style.nix {theme = config.theme;}; - }; - }; -} diff --git a/programs/wofi/style.nix b/programs/wofi/style.nix deleted file mode 100644 index 27b7205..0000000 --- a/programs/wofi/style.nix +++ /dev/null @@ -1,74 +0,0 @@ -{theme}: let - fg = "#${theme.colors.fg}"; - bg = "#${theme.colors.bg}"; - surface-fg = "#${theme.colors.surface.fg}"; - surface-bg = "#${theme.colors.surface.bg}"; - primary = "#${theme.colors.primary}"; - fontSize = "${toString theme.font.size}px"; - outerGap = "${toString theme.outerGap}px"; - innerGap = "${toString theme.innerGap}px"; - outerRadius = "${toString theme.outerRadius}px"; - innerRadius = "${toString theme.innerRadius}px"; - borderWidth = "${toString theme.borderWidth}px"; -in '' - * { - font-family: ${theme.font.monospace}; - font-size: ${fontSize}; - } - - /* Window */ - window { - margin: 0px; - border: ${borderWidth} solid ${primary}; - border-radius: ${outerRadius}; - background-color: ${bg}; - } - - /* Outer Box */ - #outer-box { - padding: ${outerGap}; - } - - /* Scroll */ - #scroll { - margin: 0px; - padding: ${innerGap}; - border: none; - } - - /* Input */ - #input { - margin: ${innerGap}; - padding: ${innerGap}; - border: none; - color: ${surface-fg}; - background-color: ${surface-bg}; - border-radius: ${outerRadius}; - } - - #input:focus, - #input:active { - border: ${borderWidth} solid ${primary}; - box-shadow: none; - outline: none; - } - - /* Text */ - #text { - margin: ${innerGap}; - padding: ${innerGap}; - border: none; - color: ${fg}; - } - - /* Selected Entry */ - #entry:selected { - background-color: ${primary}; - border-radius: ${outerRadius}; - } - - #entry:selected #text { - color: ${bg}; - } - -'' diff --git a/programs/zsh/default.nix b/programs/zsh/default.nix deleted file mode 100644 index ce1820e..0000000 --- a/programs/zsh/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{config, ...}: { - programs.zsh = { - enable = true; - enableCompletion = true; - enableGlobalCompInit = false; - autosuggestions.enable = true; - syntaxHighlighting.enable = true; - histSize = 10000; - }; - - home-manager.users.${config.user} = { - home.file = { - ".zshrc".source = ./zshrc; - ".zprofile".source = ./zprofile; - }; - }; -} diff --git a/programs/zsh/zprofile b/programs/zsh/zprofile deleted file mode 100644 index 4815b36..0000000 --- a/programs/zsh/zprofile +++ /dev/null @@ -1,11 +0,0 @@ -# dont attempt to launch a graphical -# env in tmux -if [ -n "$TMUX" ]; then - return -fi - -# only launch hyprland on tty 1 -if [ -z "${WAYLAND_DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then - export XDG_CURRENT_DESKTOP=Hyprland - exec dbus-run-session Hyprland -fi diff --git a/programs/zsh/zshrc b/programs/zsh/zshrc deleted file mode 100644 index b1c61a2..0000000 --- a/programs/zsh/zshrc +++ /dev/null @@ -1,73 +0,0 @@ -# zsh initalization file - -# export 'SHELL' to child processes -export SHELL - -if [[ $- != *i* ]] -then - # We are being invoked from a non-interactive shell. If this - # is an SSH session (as in "ssh host command"), source - # /etc/profile so we get PATH and other essential variables. - [[ -n "$SSH_CLIENT" ]] && source /etc/profile - - # Don't do anything else. - return -fi - -# update PATH -PATH=$PATH:$HOME/.local/bin -PATH=$PATH:$HOME/.cargo/bin - -# vim mode >:) -# no ryan i am not copying you -set -o vi -set show-mode-in-prompt on - -# Set shell prompt using starship -if command -v "starship" > /dev/null; then - eval "$(starship init zsh)" -else - export PS1="$$USER: " -fi - -# aliases -alias rf="rm -fr" # remove le french hon hon hon -alias ls="ls --color=auto" -alias ip="ip --color=auto" -alias grep="grep --color=auto" -alias diff="diff --color=auto" -alias vim="nvim" -alias ssh='TERM=xterm-256color ssh' # xterm-kitty bad - -# nix rebuild -alias rs="sudo nixos-rebuild switch --flake ~/.config/nix#$(hostname)" -alias rh="home-manager switch --flake ~/.config/nix#$(hostname)" - -# manpages -export LESS_TERMCAP_md=$'\e[1;36m' -export LESS_TERMCAP_me=$'\e[0m' -export LESS_TERMCAP_se=$'\e[0m' -export LESS_TERMCAP_so=$'\e[1;92m' -export LESS_TERMCAP_ue=$'\e[0m' -export LESS_TERMCAP_us=$'\e[1;35m' -export GROFF_NO_SGR=1 - -# compinit -autoload compinit && compinit - -# keybinds -bindkey "\e[1;5D" backward-word -bindkey "\e[1;5C" forward-word -bindkey "\e[3;5~" kill-word -bindkey "\C-_" backward-kill-word -bindkey "\e[3~" delete-char -bindkey "\e[H" beginning-of-line -bindkey "\e[F" end-of-line -bindkey "\e\d" undo - -# gpg -export GPG_TTY=$(tty) -export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) - -# ricing -pfetch diff --git a/system/default.nix b/system/default.nix index a026eb1..4695ea6 100644 --- a/system/default.nix +++ b/system/default.nix @@ -4,6 +4,11 @@ pkgs, ... }: { + imports = [ + ./hardware.nix + ./sshd.nix + ]; + # allow flakes nix.settings.experimental-features = ["nix-command" "flakes"]; @@ -121,15 +126,11 @@ openFirewall = true; }; - # docker - virtualisation.docker.enable = true; - virtualisation.docker.storageDriver = "btrfs"; - # create user account users.users.${config.user} = { isNormalUser = true; description = config.fullName; - extraGroups = ["networkmanager" "wheel" "sys" "video" "audio" "docker" "libvirtd"]; + extraGroups = ["networkmanager" "wheel" "sys" "video" "audio"]; home = config.homePath; shell = pkgs.zsh; }; @@ -139,62 +140,4 @@ ../files/certs/freyanet.crt ../files/certs/tinternet.crt ]; - - # mime - environment.pathsToLink = [ - "/share/mime" - ]; - - # fonts - fonts.packages = - (with pkgs; [ - corefonts - dejavu_fonts - fira-code - fira-code-symbols - jetbrains-mono - material-icons - nerd-fonts.fira-code - noto-fonts - noto-fonts-cjk-sans - noto-fonts-emoji - twemoji-color-font - vistafonts - ]) - ++ (with inputs.apple-fonts.packages.${pkgs.system}; [ - sf-pro - sf-mono - sf-compact - ]); - - fonts.fontconfig = { - enable = true; - defaultFonts = { - serif = [ - "Twemoji" - "DejaVu Serif" - ]; - sansSerif = [ - "Twemoji" - "DejaVu Sans" - ]; - monospace = [ - "Fira Code" - "FiraCode Nerd Font Mono" - "Font Awesome 6 Pro Regular" - "Twemoji" - "DejaVu Sans Mono" - ]; - emoji = [ - "Twemoji" - "Noto Color Emoji" - ]; - }; - }; - - # vms - programs.virt-manager.enable = true; - users.groups.libvirtd.members = [config.user]; - virtualisation.libvirtd.enable = true; - virtualisation.spiceUSBRedirection.enable = true; } diff --git a/system/hardware.nix b/system/hardware.nix new file mode 100644 index 0000000..853a6cc --- /dev/null +++ b/system/hardware.nix @@ -0,0 +1,9 @@ +{pkgs, ...}: { + # yubikey support + services = { + pcscd.enable = true; + udev.packages = with pkgs; [ + yubikey-personalization + ]; + }; +} diff --git a/system/sshd.nix b/system/sshd.nix new file mode 100644 index 0000000..0e0f1a2 --- /dev/null +++ b/system/sshd.nix @@ -0,0 +1,33 @@ +{config, ...}: { + # sshd + services.openssh = { + enable = true; + ports = [22]; + settings = { + PasswordAuthentication = false; + KbdInteractiveAuthentication = false; + UseDns = true; + X11Forwarding = false; + PermitRootLogin = "no"; + }; + }; + + # allow ssh port + networking.firewall.allowedTCPPorts = [22]; + + # ban evil + services.fail2ban = { + enable = true; + ignoreIP = [ + # freyanet + "10.0.0.0/14" + ]; + }; + + # add authorized keys + users.users.${config.user} = { + openssh.authorizedKeys.keyFiles = [ + ../files/keys/ssh.pub + ]; + }; +} -- cgit v1.2.3-freya