From 6b31a53666059962b5ccc607e7891b65f0da8138 Mon Sep 17 00:00:00 2001 From: Natasha Moongrave Date: Sun, 1 Feb 2026 23:24:25 +0100 Subject: moved stuff --- modules/nixos/hyprland.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 modules/nixos/hyprland.nix (limited to 'modules/nixos/hyprland.nix') diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix new file mode 100644 index 0000000..9d00cec --- /dev/null +++ b/modules/nixos/hyprland.nix @@ -0,0 +1,25 @@ +{ pkgs, ... }: + +{ + # Enable Hyprland + programs.hyprland = { + enable = true; + withUWSM = true; + }; + environment.sessionVariables.NIXOS_OZONE_WL = "1"; + environment.sessionVariables.WLR_NO_HARDWARE_CURSORS = "1"; + + programs.hyprlock.enable = true; + services.hypridle.enable = true; + + environment.systemPackages = with pkgs; [ + pyprland + hyprpicker + hyprcursor + hyprlock + hypridle + hyprpaper + hyprsunset + hyprpolkitagent + ]; +} \ No newline at end of file -- cgit v1.2.3 From 5f8f587c5edaf1f2ffb456f55477bd1b2ce2d444 Mon Sep 17 00:00:00 2001 From: Natasha Moongrave Date: Mon, 2 Feb 2026 10:37:04 +0100 Subject: moved things, removed useless nixos modules, switched to hyprland --- modules/home/hyprland/default.nix | 7 ++ modules/home/hyprland/kitty.nix | 7 ++ modules/home/i3wm/default.nix | 16 +++ modules/home/i3wm/dunst.nix | 45 ++++++++ modules/home/i3wm/i3.nix | 130 +++++++++++++++++++++++ modules/home/i3wm/kitty.nix | 45 ++++++++ modules/home/i3wm/neovim.nix | 101 ++++++++++++++++++ modules/home/i3wm/nnn.nix | 7 ++ modules/home/i3wm/original/default.nix | 16 --- modules/home/i3wm/original/dunst.nix | 45 -------- modules/home/i3wm/original/i3.nix | 130 ----------------------- modules/home/i3wm/original/kitty.nix | 45 -------- modules/home/i3wm/original/neovim.nix | 101 ------------------ modules/home/i3wm/original/nnn.nix | 7 -- modules/home/i3wm/original/picom.nix | 24 ----- modules/home/i3wm/original/polybar.nix | 181 --------------------------------- modules/home/i3wm/original/rofi.nix | 13 --- modules/home/i3wm/original/scripts.nix | 31 ------ modules/home/i3wm/original/xdg.nix | 16 --- modules/home/i3wm/picom.nix | 24 +++++ modules/home/i3wm/polybar.nix | 181 +++++++++++++++++++++++++++++++++ modules/home/i3wm/rofi.nix | 13 +++ modules/home/i3wm/scripts.nix | 31 ++++++ modules/home/i3wm/xdg.nix | 16 +++ modules/nixos/hyprland.nix | 25 ----- mun.nix | 2 +- 26 files changed, 624 insertions(+), 635 deletions(-) create mode 100644 modules/home/hyprland/default.nix create mode 100644 modules/home/hyprland/kitty.nix create mode 100644 modules/home/i3wm/default.nix create mode 100644 modules/home/i3wm/dunst.nix create mode 100644 modules/home/i3wm/i3.nix create mode 100644 modules/home/i3wm/kitty.nix create mode 100644 modules/home/i3wm/neovim.nix create mode 100644 modules/home/i3wm/nnn.nix delete mode 100644 modules/home/i3wm/original/default.nix delete mode 100644 modules/home/i3wm/original/dunst.nix delete mode 100644 modules/home/i3wm/original/i3.nix delete mode 100644 modules/home/i3wm/original/kitty.nix delete mode 100644 modules/home/i3wm/original/neovim.nix delete mode 100644 modules/home/i3wm/original/nnn.nix delete mode 100644 modules/home/i3wm/original/picom.nix delete mode 100644 modules/home/i3wm/original/polybar.nix delete mode 100644 modules/home/i3wm/original/rofi.nix delete mode 100644 modules/home/i3wm/original/scripts.nix delete mode 100644 modules/home/i3wm/original/xdg.nix create mode 100644 modules/home/i3wm/picom.nix create mode 100644 modules/home/i3wm/polybar.nix create mode 100644 modules/home/i3wm/rofi.nix create mode 100644 modules/home/i3wm/scripts.nix create mode 100644 modules/home/i3wm/xdg.nix delete mode 100644 modules/nixos/hyprland.nix (limited to 'modules/nixos/hyprland.nix') diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix new file mode 100644 index 0000000..67ead8f --- /dev/null +++ b/modules/home/hyprland/default.nix @@ -0,0 +1,7 @@ +{ ... }: + +{ + imports = [ + ./hyprland.nix + ]; +} \ No newline at end of file diff --git a/modules/home/hyprland/kitty.nix b/modules/home/hyprland/kitty.nix new file mode 100644 index 0000000..30f35d5 --- /dev/null +++ b/modules/home/hyprland/kitty.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: + +{ + programs.kitty = { + enable = true; + } +} \ No newline at end of file diff --git a/modules/home/i3wm/default.nix b/modules/home/i3wm/default.nix new file mode 100644 index 0000000..6fef12b --- /dev/null +++ b/modules/home/i3wm/default.nix @@ -0,0 +1,16 @@ +{ ... }: + +{ + imports = [ + ./dunst.nix + ./i3.nix + ./kitty.nix + ./neovim.nix + ./nnn.nix + ./picom.nix + ./polybar.nix + ./rofi.nix + ./scripts.nix + ./xdg.nix + ]; +} \ No newline at end of file diff --git a/modules/home/i3wm/dunst.nix b/modules/home/i3wm/dunst.nix new file mode 100644 index 0000000..6f217d9 --- /dev/null +++ b/modules/home/i3wm/dunst.nix @@ -0,0 +1,45 @@ +{ config, pkgs, lib, ... }: + +{ + services.dunst = { + enable = true; + + settings = let + colors = { + foreground = "#d0b6fd"; + background = "#1c182d"; + alert = "#7b91fc"; + }; + in { + global = { + width = "(200,300)"; + height = "(0,150)"; + offset = "(30,50)"; + origin = "bottom-right"; + transparency = 10; + frame_width = 0; + font = "Fira Code 10"; + }; + + urgency_low = { + background = colors.background; + foreground = colors.foreground; + timeout = 8; + }; + + urgency_normal = { + background = colors.background; + foreground = colors.foreground; + frame-size = "0"; + timeout = 10; + }; + + urgency_critical = { + background = colors.background; + foreground = colors.foreground; + frame-size = "5"; + frame-color = colors.alert; + }; + }; + }; +} \ No newline at end of file diff --git a/modules/home/i3wm/i3.nix b/modules/home/i3wm/i3.nix new file mode 100644 index 0000000..35ce6de --- /dev/null +++ b/modules/home/i3wm/i3.nix @@ -0,0 +1,130 @@ +{ config, pkgs, lib, ... }: + +{ + xsession.windowManager.i3 = { + enable = true; + config.bars = []; + + extraConfig = '' + # i3 config + set $mod Mod4 + font pango:Fira Code 10 + + exec --no-startup-id dex-autostart --autostart --environment i3 + exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock-fancy-rapid 5 3 --nofork + exec --no-startup-id nm-applet + exec --no-startup-id blueman-applet + exec_always --no-startup-id sh -c "sleep 1 && picom --config ~/.config/picom/picom.conf" + exec --no-startup-id -merge ~/.Xresources + exec_always --no-startup-id feh --bg-scale ~/Pictures/wallpapers/vox.jpg + exec_always --no-startup-id sh -c "killall -q polybar; sleep 1; polybar example --config=~/.config/polybar/config.ini &" + exec_always --no-startup-id polybar-hide-on-fullscreen + exec --no-startup-id flameshot + + gaps top 60 + + bindsym XF86MonBrightnessDown exec brightnessctl set 10%- + bindsym XF86MonBrightnessUp exec brightnessctl set +10% + bindsym XF86AudioMute exec amixer set Master toggle + bindsym XF86AudioLowerVolume exec amixer set Master 5%- + bindsym XF86AudioRaiseVolume exec amixer set Master 5%+ + bindsym XF86AudioMicMute exec amixer set Capture toggle + + floating_modifier $mod + + bindsym $mod+Shift+s exec flameshot gui + bindsym $mod+Return exec kitty + bindsym $mod+Control+l exec --no-startup-id i3lock-fancy-rapid 5 3 + bindsym $mod+m exec rofi -show drun + bindsym $mod+Shift+m exec kitty nnn + bindsym $mod+n exec firefox + bindsym $mod+Shift+q kill + + bindsym $mod+j focus left + bindsym $mod+k focus down + bindsym $mod+l focus up + bindsym $mod+uring focus right + + bindsym $mod+Shift+j move left + bindsym $mod+Shift+k move down + bindsym $mod+Shift+l move up + bindsym $mod+Shift+uring move right + + bindsym $mod+h split h + bindsym $mod+v split v + bindsym $mod+f fullscreen toggle + bindsym $mod+s layout stacking + bindsym $mod+w layout tabbed + bindsym $mod+e layout toggle split + bindsym $mod+Shift+space floating toggle + bindsym $mod+space focus mode_toggle + bindsym $mod+a focus parent + + set $ws1 "1" + set $ws2 "2" + set $ws3 "3" + set $ws4 "4" + set $ws5 "5" + set $ws6 "6" + set $ws7 "7" + set $ws8 "8" + set $ws9 "9" + set $ws10 "10" + + bindsym $mod+plus workspace number $ws1 + bindsym $mod+ecaron workspace number $ws2 + bindsym $mod+scaron workspace number $ws3 + bindsym $mod+ccaron workspace number $ws4 + bindsym $mod+rcaron workspace number $ws5 + bindsym $mod+zcaron workspace number $ws6 + bindsym $mod+yacute workspace number $ws7 + bindsym $mod+aacute workspace number $ws8 + bindsym $mod+iacute workspace number $ws9 + bindsym $mod+eacute workspace number $ws10 + + bindsym $mod+Shift+plus move container to workspace number $ws1 + bindsym $mod+Shift+ecaron move container to workspace number $ws2 + bindsym $mod+Shift+scaron move container to workspace number $ws3 + bindsym $mod+Shift+ccaron move container to workspace number $ws4 + bindsym $mod+Shift+rcaron move container to workspace number $ws5 + bindsym $mod+Shift+zcaron move container to workspace number $ws6 + bindsym $mod+Shift+yacute move container to workspace number $ws7 + bindsym $mod+Shift+aacute move container to workspace number $ws8 + bindsym $mod+Shift+iacute move container to workspace number $ws9 + bindsym $mod+Shift+eacute move container to workspace number $ws10 + + bindsym $mod+Shift+c reload + bindsym $mod+Shift+r restart + bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'" + + mode "resize" { + bindsym j resize shrink width 5 px or 5 ppt + bindsym k resize grow height 5 px or 5 ppt + bindsym l resize shrink height 5 px or 5 ppt + bindsym uring resize grow width 5 px or 5 ppt + + bindsym Left resize shrink width 5 px or 5 ppt + bindsym Down resize grow height 5 px or 5 ppt + bindsym Up resize shrink height 5 px or 5 ppt + bindsym Right resize grow width 5 px or 5 ppt + + bindsym Return mode "default" + bindsym Escape mode "default" + bindsym $mod+r mode "default" + } + + bindsym $mod+r mode "resize" + + client.focused #FFFFFF #FFFFFF #FFFFFF #FFFFFF #b12cbf + client.focused_inactive #8C8C8C #4C4C4C #FFFFFF #4C4C4C #FFFFFF + client.unfocused #4C4C4C #222222 #888888 #292D2E #500096 + client.urgent #EC69A0 #DB3279 #FFFFFF #DB3279 #DB3279 + client.placeholder #000000 #0C0C0C #FFFFFF #000000 #FFFFFF + client.background #FFFFFF + + default_border pixel 3 + default_floating_border pixel 3 + hide_edge_borders smart + ''; + }; +} \ No newline at end of file diff --git a/modules/home/i3wm/kitty.nix b/modules/home/i3wm/kitty.nix new file mode 100644 index 0000000..17b220d --- /dev/null +++ b/modules/home/i3wm/kitty.nix @@ -0,0 +1,45 @@ +{ config, pkgs, lib, ... }: + +{ + programs.kitty = { + enable = true; + extraConfig = '' + confirm_os_window_close 0 + font_family Fira Code + bold_font Fira Code Bold + italic_font Fira Code Light + shell_integration no-cursor + cursor_shape beam + window_padding_width 7 + window_padding_height 10 + scrollback_lines 3000 + font_size 11 + map ctrl+shift+plus change_font_size all +1.0 + map ctrl+shift+minus change_font_size all -1.0 + background_opacity 0.7 + + cursor #AC82E9 + selection_background #d8cab8 + selection_foreground #141216 + background #141216 + foreground #d8cab8 + + color0 #2b2135 + color8 #92fcfa + color1 #fc4649 + color9 #fc4649 + color2 #c4e881 + color10 #c4e881 + color3 #AC82E9 + color11 #AC82E9 + color4 #7b91fc + color12 #7b91fc + color5 #f3fc7b + color13 #f3fc7b + color6 #8F56E1 + color14 #8F56E1 + color7 #fc92fc + color15 #d8cab8 + ''; + }; +} \ No newline at end of file diff --git a/modules/home/i3wm/neovim.nix b/modules/home/i3wm/neovim.nix new file mode 100644 index 0000000..e59fd3d --- /dev/null +++ b/modules/home/i3wm/neovim.nix @@ -0,0 +1,101 @@ +{ pkgs, ... }: + +{ + programs.neovim = { + enable = true; + defaultEditor = true; + viAlias = true; + vimAlias = true; + withNodeJs = true; + + # +ANT FIX + plugins = []; # disable HM plugin processing + + extraLuaConfig = '' + -- LazyVim bootstrap + local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" + if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ + "git", "clone", "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", lazypath, + }) + end + vim.opt.rtp:prepend(lazypath) + + require("lazy").setup({ + spec = { + { "LazyVim/LazyVim", import = "lazyvim.plugins" }, + { import = "lazyvim.plugins.extras.lang.tex" }, + { import = "lazyvim.plugins.extras.lang.markdown" }, + { import = "lazyvim.plugins.extras.ui.mini-animate" }, + { import = "lazyvim.plugins.extras.lang.typescript" }, + { import = "lazyvim.plugins.extras.lang.python" }, + { import = "lazyvim.plugins.extras.lang.rust" }, + { import = "lazyvim.plugins.extras.lang.nix" }, + + { + "lervag/vimtex", + lazy = false, + init = function() + vim.g.vimtex_view_method = "zathura" + end + }, + + { + "MeanderingProgrammer/render-markdown.nvim", + opts = { + enabled = true, + file_types = { "markdown", "rmd" }, + colorscheme = "default", + }, + dependencies = { + "nvim-treesitter/nvim-treesitter", + "nvim-tree/nvim-web-devicons", + }, + }, + + { "mracos/mermaid.vim", ft = { "mermaid" } }, + }, + + defaults = { lazy = false, version = false }, + checker = { enabled = true }, + + performance = { + rtp = { + disabled_plugins = { + "gzip", "tarPlugin", "tohtml", + "tutor", "zipPlugin", + }, + }, + }, + }) + + -- LaTeX wrapping + vim.api.nvim_create_autocmd("FileType", { + pattern = "tex", + callback = function() + vim.opt_local.wrap = true + vim.opt_local.linebreak = true + vim.opt_local.breakindent = true + vim.opt_local.breakindentopt = "shift:2" + vim.opt_local.textwidth = 0 + end, + }) + + -- Disable diagnostics in markdown + vim.api.nvim_create_autocmd("FileType", { + pattern = "markdown", + callback = function() + vim.diagnostic.disable(0) + end, + }) + + -- Nix LSP + local lspconfig = require("lspconfig") + lspconfig.nil_ls.setup({ cmd = { "nil" } }) + + vim.opt.clipboard = "unnamedplus" + ''; + }; +} \ No newline at end of file diff --git a/modules/home/i3wm/nnn.nix b/modules/home/i3wm/nnn.nix new file mode 100644 index 0000000..74b7dcb --- /dev/null +++ b/modules/home/i3wm/nnn.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + programs.nnn = { + enable = true; + package = pkgs.nnn.override { withNerdIcons = true; }; + }; +} \ No newline at end of file diff --git a/modules/home/i3wm/original/default.nix b/modules/home/i3wm/original/default.nix deleted file mode 100644 index 6fef12b..0000000 --- a/modules/home/i3wm/original/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ ... }: - -{ - imports = [ - ./dunst.nix - ./i3.nix - ./kitty.nix - ./neovim.nix - ./nnn.nix - ./picom.nix - ./polybar.nix - ./rofi.nix - ./scripts.nix - ./xdg.nix - ]; -} \ No newline at end of file diff --git a/modules/home/i3wm/original/dunst.nix b/modules/home/i3wm/original/dunst.nix deleted file mode 100644 index 6f217d9..0000000 --- a/modules/home/i3wm/original/dunst.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - services.dunst = { - enable = true; - - settings = let - colors = { - foreground = "#d0b6fd"; - background = "#1c182d"; - alert = "#7b91fc"; - }; - in { - global = { - width = "(200,300)"; - height = "(0,150)"; - offset = "(30,50)"; - origin = "bottom-right"; - transparency = 10; - frame_width = 0; - font = "Fira Code 10"; - }; - - urgency_low = { - background = colors.background; - foreground = colors.foreground; - timeout = 8; - }; - - urgency_normal = { - background = colors.background; - foreground = colors.foreground; - frame-size = "0"; - timeout = 10; - }; - - urgency_critical = { - background = colors.background; - foreground = colors.foreground; - frame-size = "5"; - frame-color = colors.alert; - }; - }; - }; -} \ No newline at end of file diff --git a/modules/home/i3wm/original/i3.nix b/modules/home/i3wm/original/i3.nix deleted file mode 100644 index 35ce6de..0000000 --- a/modules/home/i3wm/original/i3.nix +++ /dev/null @@ -1,130 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - xsession.windowManager.i3 = { - enable = true; - config.bars = []; - - extraConfig = '' - # i3 config - set $mod Mod4 - font pango:Fira Code 10 - - exec --no-startup-id dex-autostart --autostart --environment i3 - exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock-fancy-rapid 5 3 --nofork - exec --no-startup-id nm-applet - exec --no-startup-id blueman-applet - exec_always --no-startup-id sh -c "sleep 1 && picom --config ~/.config/picom/picom.conf" - exec --no-startup-id -merge ~/.Xresources - exec_always --no-startup-id feh --bg-scale ~/Pictures/wallpapers/vox.jpg - exec_always --no-startup-id sh -c "killall -q polybar; sleep 1; polybar example --config=~/.config/polybar/config.ini &" - exec_always --no-startup-id polybar-hide-on-fullscreen - exec --no-startup-id flameshot - - gaps top 60 - - bindsym XF86MonBrightnessDown exec brightnessctl set 10%- - bindsym XF86MonBrightnessUp exec brightnessctl set +10% - bindsym XF86AudioMute exec amixer set Master toggle - bindsym XF86AudioLowerVolume exec amixer set Master 5%- - bindsym XF86AudioRaiseVolume exec amixer set Master 5%+ - bindsym XF86AudioMicMute exec amixer set Capture toggle - - floating_modifier $mod - - bindsym $mod+Shift+s exec flameshot gui - bindsym $mod+Return exec kitty - bindsym $mod+Control+l exec --no-startup-id i3lock-fancy-rapid 5 3 - bindsym $mod+m exec rofi -show drun - bindsym $mod+Shift+m exec kitty nnn - bindsym $mod+n exec firefox - bindsym $mod+Shift+q kill - - bindsym $mod+j focus left - bindsym $mod+k focus down - bindsym $mod+l focus up - bindsym $mod+uring focus right - - bindsym $mod+Shift+j move left - bindsym $mod+Shift+k move down - bindsym $mod+Shift+l move up - bindsym $mod+Shift+uring move right - - bindsym $mod+h split h - bindsym $mod+v split v - bindsym $mod+f fullscreen toggle - bindsym $mod+s layout stacking - bindsym $mod+w layout tabbed - bindsym $mod+e layout toggle split - bindsym $mod+Shift+space floating toggle - bindsym $mod+space focus mode_toggle - bindsym $mod+a focus parent - - set $ws1 "1" - set $ws2 "2" - set $ws3 "3" - set $ws4 "4" - set $ws5 "5" - set $ws6 "6" - set $ws7 "7" - set $ws8 "8" - set $ws9 "9" - set $ws10 "10" - - bindsym $mod+plus workspace number $ws1 - bindsym $mod+ecaron workspace number $ws2 - bindsym $mod+scaron workspace number $ws3 - bindsym $mod+ccaron workspace number $ws4 - bindsym $mod+rcaron workspace number $ws5 - bindsym $mod+zcaron workspace number $ws6 - bindsym $mod+yacute workspace number $ws7 - bindsym $mod+aacute workspace number $ws8 - bindsym $mod+iacute workspace number $ws9 - bindsym $mod+eacute workspace number $ws10 - - bindsym $mod+Shift+plus move container to workspace number $ws1 - bindsym $mod+Shift+ecaron move container to workspace number $ws2 - bindsym $mod+Shift+scaron move container to workspace number $ws3 - bindsym $mod+Shift+ccaron move container to workspace number $ws4 - bindsym $mod+Shift+rcaron move container to workspace number $ws5 - bindsym $mod+Shift+zcaron move container to workspace number $ws6 - bindsym $mod+Shift+yacute move container to workspace number $ws7 - bindsym $mod+Shift+aacute move container to workspace number $ws8 - bindsym $mod+Shift+iacute move container to workspace number $ws9 - bindsym $mod+Shift+eacute move container to workspace number $ws10 - - bindsym $mod+Shift+c reload - bindsym $mod+Shift+r restart - bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'" - - mode "resize" { - bindsym j resize shrink width 5 px or 5 ppt - bindsym k resize grow height 5 px or 5 ppt - bindsym l resize shrink height 5 px or 5 ppt - bindsym uring resize grow width 5 px or 5 ppt - - bindsym Left resize shrink width 5 px or 5 ppt - bindsym Down resize grow height 5 px or 5 ppt - bindsym Up resize shrink height 5 px or 5 ppt - bindsym Right resize grow width 5 px or 5 ppt - - bindsym Return mode "default" - bindsym Escape mode "default" - bindsym $mod+r mode "default" - } - - bindsym $mod+r mode "resize" - - client.focused #FFFFFF #FFFFFF #FFFFFF #FFFFFF #b12cbf - client.focused_inactive #8C8C8C #4C4C4C #FFFFFF #4C4C4C #FFFFFF - client.unfocused #4C4C4C #222222 #888888 #292D2E #500096 - client.urgent #EC69A0 #DB3279 #FFFFFF #DB3279 #DB3279 - client.placeholder #000000 #0C0C0C #FFFFFF #000000 #FFFFFF - client.background #FFFFFF - - default_border pixel 3 - default_floating_border pixel 3 - hide_edge_borders smart - ''; - }; -} \ No newline at end of file diff --git a/modules/home/i3wm/original/kitty.nix b/modules/home/i3wm/original/kitty.nix deleted file mode 100644 index 17b220d..0000000 --- a/modules/home/i3wm/original/kitty.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - programs.kitty = { - enable = true; - extraConfig = '' - confirm_os_window_close 0 - font_family Fira Code - bold_font Fira Code Bold - italic_font Fira Code Light - shell_integration no-cursor - cursor_shape beam - window_padding_width 7 - window_padding_height 10 - scrollback_lines 3000 - font_size 11 - map ctrl+shift+plus change_font_size all +1.0 - map ctrl+shift+minus change_font_size all -1.0 - background_opacity 0.7 - - cursor #AC82E9 - selection_background #d8cab8 - selection_foreground #141216 - background #141216 - foreground #d8cab8 - - color0 #2b2135 - color8 #92fcfa - color1 #fc4649 - color9 #fc4649 - color2 #c4e881 - color10 #c4e881 - color3 #AC82E9 - color11 #AC82E9 - color4 #7b91fc - color12 #7b91fc - color5 #f3fc7b - color13 #f3fc7b - color6 #8F56E1 - color14 #8F56E1 - color7 #fc92fc - color15 #d8cab8 - ''; - }; -} \ No newline at end of file diff --git a/modules/home/i3wm/original/neovim.nix b/modules/home/i3wm/original/neovim.nix deleted file mode 100644 index e59fd3d..0000000 --- a/modules/home/i3wm/original/neovim.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ pkgs, ... }: - -{ - programs.neovim = { - enable = true; - defaultEditor = true; - viAlias = true; - vimAlias = true; - withNodeJs = true; - - # +ANT FIX - plugins = []; # disable HM plugin processing - - extraLuaConfig = '' - -- LazyVim bootstrap - local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" - if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", "clone", "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", lazypath, - }) - end - vim.opt.rtp:prepend(lazypath) - - require("lazy").setup({ - spec = { - { "LazyVim/LazyVim", import = "lazyvim.plugins" }, - { import = "lazyvim.plugins.extras.lang.tex" }, - { import = "lazyvim.plugins.extras.lang.markdown" }, - { import = "lazyvim.plugins.extras.ui.mini-animate" }, - { import = "lazyvim.plugins.extras.lang.typescript" }, - { import = "lazyvim.plugins.extras.lang.python" }, - { import = "lazyvim.plugins.extras.lang.rust" }, - { import = "lazyvim.plugins.extras.lang.nix" }, - - { - "lervag/vimtex", - lazy = false, - init = function() - vim.g.vimtex_view_method = "zathura" - end - }, - - { - "MeanderingProgrammer/render-markdown.nvim", - opts = { - enabled = true, - file_types = { "markdown", "rmd" }, - colorscheme = "default", - }, - dependencies = { - "nvim-treesitter/nvim-treesitter", - "nvim-tree/nvim-web-devicons", - }, - }, - - { "mracos/mermaid.vim", ft = { "mermaid" } }, - }, - - defaults = { lazy = false, version = false }, - checker = { enabled = true }, - - performance = { - rtp = { - disabled_plugins = { - "gzip", "tarPlugin", "tohtml", - "tutor", "zipPlugin", - }, - }, - }, - }) - - -- LaTeX wrapping - vim.api.nvim_create_autocmd("FileType", { - pattern = "tex", - callback = function() - vim.opt_local.wrap = true - vim.opt_local.linebreak = true - vim.opt_local.breakindent = true - vim.opt_local.breakindentopt = "shift:2" - vim.opt_local.textwidth = 0 - end, - }) - - -- Disable diagnostics in markdown - vim.api.nvim_create_autocmd("FileType", { - pattern = "markdown", - callback = function() - vim.diagnostic.disable(0) - end, - }) - - -- Nix LSP - local lspconfig = require("lspconfig") - lspconfig.nil_ls.setup({ cmd = { "nil" } }) - - vim.opt.clipboard = "unnamedplus" - ''; - }; -} \ No newline at end of file diff --git a/modules/home/i3wm/original/nnn.nix b/modules/home/i3wm/original/nnn.nix deleted file mode 100644 index 74b7dcb..0000000 --- a/modules/home/i3wm/original/nnn.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, ... }: -{ - programs.nnn = { - enable = true; - package = pkgs.nnn.override { withNerdIcons = true; }; - }; -} \ No newline at end of file diff --git a/modules/home/i3wm/original/picom.nix b/modules/home/i3wm/original/picom.nix deleted file mode 100644 index d5f460f..0000000 --- a/modules/home/i3wm/original/picom.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - services.picom = { - enable = true; - backend = "glx"; - vSync = true; - inactiveOpacity = 0.9; - activeOpacity = 1.0; - fade = true; - fadeSteps = [ 0.09 0.09 ]; - fadeDelta = 5; - shadow = true; - shadowOffsets = [ 12 12 ]; - shadowOpacity = 0.5; - shadowExclude = [ - "class_g = 'Polybar'" - "name = 'Polybar'" - ]; - settings = { - corner-radius = 15; - }; - }; -} \ No newline at end of file diff --git a/modules/home/i3wm/original/polybar.nix b/modules/home/i3wm/original/polybar.nix deleted file mode 100644 index 95130cf..0000000 --- a/modules/home/i3wm/original/polybar.nix +++ /dev/null @@ -1,181 +0,0 @@ -{ config, pkgs, lib, ... }: - - -{ - services.polybar = { - enable = true; - - extraConfig = let - colors = { - background = "#1c182d"; - background-alt = "#2b1b3d"; - foreground = "#d0b6fd"; - primary = "#cfb5fd"; - secondary = "#8a78b0"; - alert = "#7b91fc"; - disabled = "#707880"; - }; - in '' - [bar/example] - width = 98% - height = 30pt - radius = 15 - offset-x = 1% - offset-y = 1% - override-redirect = true - fixed-center = true - enable-ipc = true - - background = ${colors.background} - foreground = ${colors.foreground} - - line-size = 4pt - border-size = Opt - border-color = #00000000 - - padding-left = 1 - padding-right = 1 - module-margin = 1 - - separator = | - separator-foreground = ${colors.disabled} - - font-0 = fira code;2 - - modules-left = xworkspaces spotify spotify-prev spotify-play-pause spotify-next - modules-center = date - modules-right = filesystem memory cpu pulseaudio-devices wlan xkeyboard battery - - [module/systray] - type = internal/tray - format-margin = 8pt - tray-spacing = 16pt - - [module/xworkspaces] - type = internal/xworkspaces - label-active = %name% - label-active-background = ${colors.background-alt} - label-active-underline = ${colors.primary} - label-active-padding = 1 - label-occupied = %name% - label-occupied-padding = 1 - label-urgent = %name% - label-urgent-background = ${colors.alert} - label-urgent-padding = 1 - label-empty = %name% - label-empty-foreground = ${colors.disabled} - label-empty-padding = 1 - - [module/xwindow] - type = internal/xwindow - label = %title:0:60:...% - - [module/filesystem] - type = internal/fs - interval = 25 - mount-0 = / - label-mounted = %{F#F0C674}%mountpoint%%{F-} %percentage_used%% - label-unmounted = %mountpoint% not mounted - label-unmounted-foreground = ${colors.disabled} - - [module/pulseaudio] - type = internal/pulseaudio - format-volume-prefix = "VOL " - format-volume-prefix-foreground = ${colors.primary} - format-volume = - label-volume = %percentage%% - label-muted = muted - label-muted-foreground = ${colors.disabled} - - [module/xkeyboard] - type = internal/xkeyboard - blacklist-0 = num lock - label-layout = %layout% - label-layout-foreground = ${colors.primary} - label-indicator-padding = 2 - label-indicator-margin = 1 - label-indicator-foreground = ${colors.background} - label-indicator-background = ${colors.secondary} - - [module/memory] - type = internal/memory - interval = 2 - format-prefix = "RAM " - format-prefix-foreground = ${colors.primary} - label = %percentage_used:2%% - - [module/cpu] - type = internal/cpu - interval = 2 - format-prefix = "CPU " - format-prefix-foreground = ${colors.primary} - label = %percentage:2%% - - [network-base] - type = internal/network - interval = 5 - format-connected = - format-disconnected = - label-disconnected = %{F#F0C674}%ifname%%{F#707880} disconnected - - [module/wlan] - inherit = network-base - interface-type = wireless - label-connected = %{F#F0C674}%ifname%%{F-} %essid% - - [module/eth] - inherit = network-base - interface-type = wired - label-connected = %{F#F0C674}%ifname%%{F-} - - [module/date] - type = internal/date - interval = 1 - date = %H:%M - date-alt = %Y-%m-%d %H:%M:%S - label = %date% - label-foreground = ${colors.primary} - - [settings] - screenchange-reload = true - pseudo-transparency = true - - [module/battery] - type = internal/battery - full-at = 100 - low-at = 15 - battery = BAT0 - adapter = ADP1 - poll-interval = 5 - - [module/spotify] - type = custom/script - tail = true - interval = 1 - format-prefix = "♫" - format =