diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/editors/nixvim.nix | 101 | ||||
| -rw-r--r-- | home/editors/nvf.nix | 4 | ||||
| -rw-r--r-- | home/home.nix | 88 | ||||
| -rw-r--r-- | home/programs/nixcord.nix | 3 | ||||
| -rw-r--r-- | home/programs/spicetify.nix | 3 | ||||
| -rw-r--r-- | home/stylix.nix | 8 | ||||
| -rw-r--r-- | home/wayland/eww.nix | 7 | ||||
| -rw-r--r-- | home/wayland/hyprland/hyprland.nix | 45 | ||||
| -rw-r--r-- | home/wayland/niri/niri.nix | 4 | ||||
| -rw-r--r-- | home/xdg.nix (renamed from home/wayland/xdg.nix) | 0 |
10 files changed, 165 insertions, 98 deletions
diff --git a/home/editors/nixvim.nix b/home/editors/nixvim.nix index 2835e1e..17ea2ec 100644 --- a/home/editors/nixvim.nix +++ b/home/editors/nixvim.nix @@ -1,7 +1,6 @@ -{ inputs, pkgs, ... }: +{ pkgs, inputs, ... }: { imports = [ inputs.nixvim.homeModules.nixvim ]; - programs.nixvim = { enable = true; package = inputs.neovim-nightly-overlay.packages.${pkgs.stdenv.hostPlatform.system}.default; @@ -11,24 +10,96 @@ waylandSupport = true; colorschemes.gruvbox.enable = true; - plugins = { - lualine.enable = true; - nvim-autopairs.enable = true; - nix.enable = true; - treesitter.enable = true; - lsp = { - enable = true; - servers = { - nil_ls.enable = true; - clangd.enable = true; - }; - }; - }; + plugins = { + lualine.enable = true; + nvim-autopairs.enable = true; + neoscroll.enable = true; + bufferline.enable = true; + treesitter = { + enable = true; + settings = { + indent.enable = true; + }; + }; + web-devicons.enable = true; + telescope = { + enable = true; + extensions = { + fzf-native = { + enable = true; + }; + }; + }; + hardtime = { + enable = false; + settings = { + disableMouse = true; + enabled = false; + restrictionMode = "hint"; + hint = true; + maxCount = 40; + maxTime = 1000; + }; + }; + nix.enable = true; + lsp = { + enable = true; + servers = { + nil_ls.enable = true; + clangd.enable = true; + }; + }; + }; opts = { number = true; relativenumber = true; + termguicolors = true; + # mouse = "a"; + ignorecase = true; + smartcase = true; + expandtab = true; shiftwidth = 2; + encoding = "utf-8"; + fileencoding = "utf-8"; + undofile = true; + swapfile = true; + backup = false; + autoread = true; + cursorline = true; + ruler = true; + gdefault = true; + scrolloff = 5; + clipboard = { + providers.wl-copy.enable = true; + register = "wl-copy"; + }; }; + + keymaps = [ + { + key = "<Up>"; + action = "<Nop>"; + mode = [ "n" "i" "v" ]; + options = { silent = true; }; + } + { key = "<Down>"; + action = "<Nop>"; + mode = [ "n" "i" "v" ]; + options = { silent = true; }; + } + { + key = "<Left>"; + action = "<Nop>"; + mode = [ "n" "i" "v" ]; + options = { silent = true; }; + } + { + key = "<Right>"; + action = "<Nop>"; + mode = [ "n" "i" "v" ]; + options = { silent = true; }; + } + ]; }; } diff --git a/home/editors/nvf.nix b/home/editors/nvf.nix index 428f41f..ab805ca 100644 --- a/home/editors/nvf.nix +++ b/home/editors/nvf.nix @@ -1,11 +1,11 @@ -{ inputs, pkgs, ... }: +{ pkgs, neovim-nightly-overlay, ... }: { programs.nvf = { enable = true; settings.vim = { - package= inputs.neovim-nightly-overlay.packages.${pkgs.stdenv.hostPlatform.system}.default; + package = neovim-nightly-overlay.packages.${pkgs.stdenv.hostPlatform.system}.default; viAlias = true; vimAlias = true; diff --git a/home/home.nix b/home/home.nix index e56d1f3..39f4567 100644 --- a/home/home.nix +++ b/home/home.nix @@ -2,19 +2,22 @@ { imports = [ - ./wayland/hyprland/binds.nix + # Window Managers + ./wayland/hyprland/hyprland.nix + ./wayland/niri/niri.nix + # Wayland specific programs ./wayland/waybar.nix + # Editors + ./editors/nixvim.nix + ./editors/helix.nix + # Programs ./terminals/foot.nix ./shells/fish.nix ./shells/starship.nix ./programs/spicetify.nix -# ./editors/nvf.nix - ./editors/nixvim.nix - ./editors/helix.nix - ./wayland/xdg.nix - ./wayland/eww.nix ./programs/nixcord.nix -# ./stylix.nix + # Other + ./xdg.nix ]; home.username = "adam"; @@ -55,66 +58,27 @@ programs.btop.enable = true; -programs.git = { - enable = true; - settings = { - user.name = "adikro"; - user.email = "adikro@disroot.org"; - init.defaultBranch = "main"; - }; -}; - -gtk = { - enable = true; - theme = { - name = "Adwaita-dark"; - package = pkgs.gnome-themes-extra; - }; -}; - -qt = { - enable = true; - style.name = "Breeze-Dark"; -}; - -wayland.windowManager.hyprland = { - enable = true; - settings = { - - general = { - gaps_in = 6; - gaps_out = 16; - border_size = 2; - }; - - decoration = { - rounding = 12; + programs.git = { + enable = true; + settings = { + user.name = "adikro"; + user.email = "adikro@disroot.org"; + init.defaultBranch = "main"; + }; }; - "$mod" = "ALT"; - monitor = [ - "DP-1,2560x1440@240,0x0,1,vrr,0" - ]; - workspace = [ - "1,monitor:DP-1,default:true" - "2,monitor:DP-1" - "3,monitor:DP-1" - "4,monitor:DP-1" - "5,monitor:DP-1" - ]; - - input = { - accel_profile = "flat"; - sensitivity = -0.6; - repeat_rate = 45; - repeat_delay = 750; + gtk = { + enable = true; + theme = { + name = "Adwaita-dark"; + package = pkgs.gnome-themes-extra; }; + }; - animations = { - enabled = false; - }; + qt = { + enable = true; + style.name = "Breeze-Dark"; }; -}; programs.home-manager.enable = true; } diff --git a/home/programs/nixcord.nix b/home/programs/nixcord.nix index ead23aa..2f73eb1 100644 --- a/home/programs/nixcord.nix +++ b/home/programs/nixcord.nix @@ -1,7 +1,6 @@ -{ pkgs, inputs, lib, config, ... }: +{ inputs, ... }: { imports = [ inputs.nixcord.homeModules.nixcord ]; - programs.nixcord = { enable = true; discord.enable = false; diff --git a/home/programs/spicetify.nix b/home/programs/spicetify.nix index a581bd6..9d66181 100644 --- a/home/programs/spicetify.nix +++ b/home/programs/spicetify.nix @@ -1,4 +1,4 @@ -{ config, pkgs, inputs, ... }: +{ pkgs, inputs, ... }: let spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system}; @@ -15,7 +15,6 @@ in { hidePodcasts ]; -# theme = spicePkgs.themes.onepunch; theme = spicePkgs.themes.catppuccin; colorScheme = "mocha"; }; diff --git a/home/stylix.nix b/home/stylix.nix deleted file mode 100644 index 16830cc..0000000 --- a/home/stylix.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ inputs, ... }: -{ - imports = [ inputs.stylix.homeModules.stylix ]; - - stylix = { - enable = true; - }; -} diff --git a/home/wayland/eww.nix b/home/wayland/eww.nix deleted file mode 100644 index fe7df23..0000000 --- a/home/wayland/eww.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: -{ - programs.eww = { - enable = true; - enableFishIntegration = true; - }; -} diff --git a/home/wayland/hyprland/hyprland.nix b/home/wayland/hyprland/hyprland.nix new file mode 100644 index 0000000..fe85283 --- /dev/null +++ b/home/wayland/hyprland/hyprland.nix @@ -0,0 +1,45 @@ +{ ... }: +{ + imports = [ + ./binds.nix + ]; + + wayland.windowManager.hyprland = { + enable = true; + settings = { + + general = { + gaps_in = 6; + gaps_out = 16; + border_size = 2; + }; + + decoration = { + rounding = 12; + }; + + "$mod" = "ALT"; + monitor = [ + "DP-1,2560x1440@240,0x0,1,vrr,0" + ]; + workspace = [ + "1,monitor:DP-1,default:true" + "2,monitor:DP-1" + "3,monitor:DP-1" + "4,monitor:DP-1" + "5,monitor:DP-1" + ]; + + input = { + accel_profile = "flat"; + sensitivity = -0.6; + repeat_rate = 45; + repeat_delay = 500; + }; + + animations = { + enabled = false; + }; + }; + }; +} diff --git a/home/wayland/niri/niri.nix b/home/wayland/niri/niri.nix new file mode 100644 index 0000000..facb35d --- /dev/null +++ b/home/wayland/niri/niri.nix @@ -0,0 +1,4 @@ +{ ... }: +{ + +} diff --git a/home/wayland/xdg.nix b/home/xdg.nix index f4b1294..f4b1294 100644 --- a/home/wayland/xdg.nix +++ b/home/xdg.nix |