summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--home-manager/common.nix153
-rw-r--r--home-manager/compositor/sway.nix21
-rw-r--r--home-manager/config/alacritty.toml88
-rw-r--r--home-manager/config/i3203
-rw-r--r--home-manager/entrypoints/personal.nix12
-rw-r--r--home-manager/entrypoints/work.nix29
-rw-r--r--home-manager/neovim/chatgpt.lua5
-rw-r--r--home-manager/neovim/copilot-vim.lua10
-rw-r--r--home-manager/neovim/harpoon.lua12
-rw-r--r--home-manager/neovim/init.lua38
-rw-r--r--home-manager/neovim/lsp-zero-nvim.lua66
-rw-r--r--home-manager/neovim/nvim-tree-lua.lua4
-rw-r--r--home-manager/neovim/nvim-treesitter.lua9
-rw-r--r--home-manager/neovim/nvim-web-devicons.lua1
-rw-r--r--home-manager/neovim/telescope-nvim.lua18
-rw-r--r--home-manager/systemd/docker.nix22
-rw-r--r--hosts/work.nix7
17 files changed, 19 insertions, 679 deletions
diff --git a/home-manager/common.nix b/home-manager/common.nix
index 42989ad..d42fac0 100644
--- a/home-manager/common.nix
+++ b/home-manager/common.nix
@@ -1,10 +1,7 @@
{ lib, pkgs, inputs, ... }: {
- # # You can also create simple shell scripts directly inside your
- # # configuration. For example, this adds a command 'my-hello' to your
- # # environment:
- # (pkgs.writeShellScriptBin "my-hello" ''
- # echo "Hello, ${config.home.username}!"
- # '')
+ imports = [
+ ./compositor/hyprland.nix
+ ];
home.packages = [
pkgs.gnumake
pkgs.git-crypt
@@ -39,35 +36,15 @@
pkgs.python313
pkgs.black
pkgs.ruff
- ];
- # # Building this configuration will create a copy of 'dotfiles/screenrc' in
- # # the Nix store. Activating the configuration will then make '~/.screenrc' a
- # # symlink to the Nix store copy.
- # ".screenrc".source = dotfiles/screenrc;
+ pkgs.font-awesome
+ pkgs.pinentry-gnome3
+ ];
- # # You can also set the file content immediately.
- # ".gradle/gradle.properties".text = ''
- # org.gradle.console=verbose
- # org.gradle.daemon.idletimeout=3600000
- # '';
- home.file = { };
- # You can also manage environment variables but you will have to manually
- # source
- #
- # ~/.nix-profile/etc/profile.d/hm-session-vars.sh
- #
- # or
- #
- # /etc/profiles/per-user/jras/etc/profile.d/hm-session-vars.sh
- #
- # if you don't want to manage your shell through Home Manager.
home.sessionVariables = { EDITOR = "hx"; };
home.sessionPath = [ "$GOBIN" ];
- # Let Home Manager install and manage itself.
- programs.home-manager.enable = true;
programs.ripgrep.enable = true;
programs.bat.enable = true;
programs.btop.enable = true;
@@ -76,6 +53,11 @@
goPath = "go";
goBin = "go/bin";
};
+ programs.rbw.enable = true;
+ programs.rbw.settings = {
+ email = "jaspert.ras@gmail.com";
+ pinentry = pkgs.pinentry-gnome3;
+ };
programs.zoxide = {
enable = true;
@@ -130,118 +112,6 @@
};
};
- programs.tmux = {
- enable = true;
- shortcut = "a";
- newSession = true;
- terminal = "tmux-256color";
- extraConfig = ''
- # Recommended by NeoVim's checkhealth
- set-option -sg escape-time 10
- set-option -g default-shell ${pkgs.zsh}/bin/zsh
-
- # # Set vim keymode
- set-window-option -g mode-keys vi
- bind-key -T copy-mode-vi v send -X begin-selection
- bind-key -T copy-mode-vi V send -X select-line
- bind-key -T copy-mode-vi y send -X copy-pipe-and-cancel 'xclip -in -selection clipboard'
- '';
- plugins = with pkgs.tmuxPlugins; [
- vim-tmux-navigator
-
- {
- plugin = catppuccin;
- extraConfig = ''
- set -g @catppuccin_flavour 'frappe'
- set -g @catppuccin_powerline_theme_enabled 'on'
- set -g @catppuccin_l_left_separator ''
- set -g @catppuccin_l_right_separator ''
- set -g @catppuccin_r_left_separator ''
- set -g @catppuccin_r_right_separator ''
- '';
- }
- ];
- };
-
- programs.neovim = {
- enable = true;
- vimAlias = true;
- plugins = with pkgs.vimPlugins; [
- gleam-vim
- plenary-nvim
- telescope-file-browser-nvim
- vim-tmux-navigator
- nui-nvim
- # Colors
- catppuccin-nvim
- # LSP
- nvim-lspconfig
- trouble-nvim
- # Completion
- luasnip
- nvim-cmp
- cmp-nvim-lsp
- cmp-nvim-lua
- cmp-buffer
- cmp-path
- cmp_luasnip
-
- {
- plugin = lsp-zero-nvim;
- type = "lua";
- config = builtins.readFile (./neovim/lsp-zero-nvim.lua);
- }
- {
- plugin = nvim-web-devicons;
- type = "lua";
- config = builtins.readFile (./neovim/nvim-web-devicons.lua);
- }
- {
- plugin = nvim-treesitter.withAllGrammars;
- type = "lua";
- config = builtins.readFile (./neovim/nvim-treesitter.lua);
- }
- {
- plugin = telescope-nvim;
- type = "lua";
- config = builtins.readFile (./neovim/telescope-nvim.lua);
- }
- {
- plugin = harpoon;
- type = "lua";
- config = builtins.readFile (./neovim/harpoon.lua);
- }
- #{
- # plugin = copilot-vim;
- # type = "lua";
- # config = builtins.readFile (./neovim/copilot-vim.lua);
- #}
- ];
- extraLuaConfig = builtins.readFile (./neovim/init.lua);
- extraConfig = ''
- set shiftwidth=4 smarttab
- set expandtab
- set tabstop=4 softtabstop=0
-
- inoremap jk <ESC>
- let mapleader=" " " remap the mapleader
-
- syntax on " syntax highlighting
- set number " show line numbers
- set relativenumber " relative line numbers
- set noswapfile " disable the swap file
- set hlsearch " highlight all results
- set ignorecase " ignore case in search
- set incsearch " show search results as you type
-
- " disable mouse
- set mouse=
-
- autocmd BufWritePost *.nix !nixfmt %
- autocmd BufWritePost *.go !gofmt -w %
- '';
- };
-
programs.starship = {
enable = true;
settings = {
@@ -356,6 +226,7 @@
};
programs.alacritty = {
+ enable = true;
settings = {
window = {
padding = { x = 5; y = 2; };
diff --git a/home-manager/compositor/sway.nix b/home-manager/compositor/sway.nix
deleted file mode 100644
index 16690e9..0000000
--- a/home-manager/compositor/sway.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ pkgs, ... }:
-{
- wayland.windowManager.sway = {
- enable = true;
-
- config = {
- terminal = "alacritty";
- modifier = "Mod4";
- menu = "${pkgs.tofi}/bin/tofi-run | ${pkgs.findutils}/bin/xargs swaymsg exec --";
- bars = [
- {
- command = "${pkgs.waybar}/bin/waybar";
- position = "bottom";
- }
- ];
- fonts = {
- names = [ "FontAwesome5Free" ];
- };
- };
- };
-}
diff --git a/home-manager/config/alacritty.toml b/home-manager/config/alacritty.toml
deleted file mode 100644
index 0594ea5..0000000
--- a/home-manager/config/alacritty.toml
+++ /dev/null
@@ -1,88 +0,0 @@
-[window]
-padding.y = 1
-
-[colors]
-[colors.bright]
-black = "#626880"
-blue = "#8CAAEE"
-cyan = "#81C8BE"
-green = "#A6D189"
-magenta = "#F4B8E4"
-red = "#E78284"
-white = "#A5ADCE"
-yellow = "#E5C890"
-
-[colors.cursor]
-cursor = "#F2D5CF"
-text = "#303446"
-
-[colors.dim]
-black = "#51576D"
-blue = "#8CAAEE"
-cyan = "#81C8BE"
-green = "#A6D189"
-magenta = "#F4B8E4"
-red = "#E78284"
-white = "#B5BFE2"
-yellow = "#E5C890"
-
-[colors.hints]
-[colors.hints.end]
-background = "#A5ADCE"
-foreground = "#303446"
-
-[colors.hints.start]
-background = "#E5C890"
-foreground = "#303446"
-
-[[colors.indexed_colors]]
-color = "#EF9F76"
-index = 16
-
-[[colors.indexed_colors]]
-color = "#F2D5CF"
-index = 17
-
-[colors.normal]
-black = "#51576D"
-blue = "#8CAAEE"
-cyan = "#81C8BE"
-green = "#A6D189"
-magenta = "#F4B8E4"
-red = "#E78284"
-white = "#B5BFE2"
-yellow = "#E5C890"
-
-[colors.primary]
-background = "#303446"
-bright_foreground = "#C6D0F5"
-dim_foreground = "#C6D0F5"
-foreground = "#C6D0F5"
-
-[colors.search]
-[colors.search.focused_match]
-background = "#A6D189"
-foreground = "#303446"
-
-[colors.search.matches]
-background = "#A5ADCE"
-foreground = "#303446"
-
-[colors.selection]
-background = "#F2D5CF"
-text = "#303446"
-
-[colors.vi_mode_cursor]
-cursor = "#BABBF1"
-text = "#303446"
-
-[env]
-TERM = "alacritty-direct"
-
-[font.normal]
-family = "CaskaydiaCove Nerd Font"
-style = "Regular"
-
-[shell]
-args = ["-l"]
-program = "/nix/store/y770h4wad1b9518vndjw8ap7m1ywjjlq-zsh-5.9/bin/zsh"
diff --git a/home-manager/config/i3 b/home-manager/config/i3
deleted file mode 100644
index e824bb1..0000000
--- a/home-manager/config/i3
+++ /dev/null
@@ -1,203 +0,0 @@
-# This file has been auto-generated by i3-config-wizard(1).
-# It will not be overwritten, so edit it as you like.
-#
-# Should you change your keyboard layout some time, delete
-# this file and re-run i3-config-wizard(1).
-#
-
-# i3 config file (v4)
-#
-# Please see https://i3wm.org/docs/userguide.html for a complete reference!
-
-set $mod Mod4
-
-# Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below.
-font pango:monospace 8
-
-# This font is widely installed, provides lots of unicode glyphs, right-to-left
-# text rendering and scalability on retina/hidpi displays (thanks to pango).
-#font pango:DejaVu Sans Mono 8
-
-# Start XDG autostart .desktop files using dex. See also
-# https://wiki.archlinux.org/index.php/XDG_Autostart
-exec --no-startup-id dex --autostart --environment i3
-
-# The combination of xss-lock, nm-applet and pactl is a popular choice, so
-# they are included here as an example. Modify as you see fit.
-
-# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
-# screen before suspend. Use loginctl lock-session to lock your screen.
-exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
-
-# NetworkManager is the most popular way to manage wireless networks on Linux,
-# and nm-applet is a desktop environment-independent system tray GUI for it.
-exec --no-startup-id nm-applet
-
-# Use pactl to adjust volume in PulseAudio.
-set $refresh_i3status killall -SIGUSR1 i3status
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
-bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
-
-# Use Mouse+$mod to drag floating windows to their wanted position
-floating_modifier $mod
-
-# start a terminal
-bindsym $mod+Return exec i3-sensible-terminal
-
-# kill focused window
-bindsym $mod+Shift+q kill
-
-# start dmenu (a program launcher)
-bindsym $mod+d exec --no-startup-id dmenu_run
-# A more modern dmenu replacement is rofi:
-# bindcode $mod+40 exec "rofi -modi drun,run -show drun"
-# There also is i3-dmenu-desktop which only displays applications shipping a
-# .desktop file. It is a wrapper around dmenu, so you need that installed.
-# bindcode $mod+40 exec --no-startup-id i3-dmenu-desktop
-
-# change focus
-bindsym $mod+h focus left
-bindsym $mod+j focus down
-bindsym $mod+k focus up
-bindsym $mod+l focus right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
-
-# move focused window
-bindsym $mod+Shift+h move left
-bindsym $mod+Shift+j move down
-bindsym $mod+Shift+k move up
-bindsym $mod+Shift+l move right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Shift+Left move left
-bindsym $mod+Shift+Down move down
-bindsym $mod+Shift+Up move up
-bindsym $mod+Shift+Right move right
-
-# split in horizontal orientation
-bindsym $mod+semicolon split h
-
-# split in vertical orientation
-bindsym $mod+v split v
-
-# enter fullscreen mode for the focused container
-bindsym $mod+f fullscreen toggle
-
-# change container layout (stacked, tabbed, toggle split)
-bindsym $mod+s layout stacking
-bindsym $mod+w layout tabbed
-bindsym $mod+e layout toggle split
-
-# toggle tiling / floating
-bindsym $mod+Shift+space floating toggle
-
-# change focus between tiling / floating windows
-bindsym $mod+space focus mode_toggle
-
-# focus the parent container
-bindsym $mod+a focus parent
-
-# focus the child container
-#bindsym $mod+d focus child
-
-# Define names for default workspaces for which we configure key bindings later on.
-# We use variables to avoid repeating the names in multiple places.
-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"
-
-# switch to workspace
-bindsym $mod+1 workspace number $ws1
-bindsym $mod+2 workspace number $ws2
-bindsym $mod+3 workspace number $ws3
-bindsym $mod+4 workspace number $ws4
-bindsym $mod+5 workspace number $ws5
-bindsym $mod+6 workspace number $ws6
-bindsym $mod+7 workspace number $ws7
-bindsym $mod+8 workspace number $ws8
-bindsym $mod+9 workspace number $ws9
-bindsym $mod+0 workspace number $ws10
-
-# move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace number $ws1
-bindsym $mod+Shift+2 move container to workspace number $ws2
-bindsym $mod+Shift+3 move container to workspace number $ws3
-bindsym $mod+Shift+4 move container to workspace number $ws4
-bindsym $mod+Shift+5 move container to workspace number $ws5
-bindsym $mod+Shift+6 move container to workspace number $ws6
-bindsym $mod+Shift+7 move container to workspace number $ws7
-bindsym $mod+Shift+8 move container to workspace number $ws8
-bindsym $mod+Shift+9 move container to workspace number $ws9
-bindsym $mod+Shift+0 move container to workspace number $ws10
-
-# reload the configuration file
-bindsym $mod+Shift+c reload
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+r restart
-# exit i3 (logs you out of your X session)
-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'"
-
-# resize window (you can also use the mouse for that)
-mode "resize" {
- # These bindings trigger as soon as you enter the resize mode
-
- # Pressing left will shrink the window’s width.
- # Pressing right will grow the window’s width.
- # Pressing up will shrink the window’s height.
- # Pressing down will grow the window’s height. bindsym j resize shrink width 10 px or 10 ppt
- bindsym k resize grow height 10 px or 10 ppt
- bindsym l resize shrink height 10 px or 10 ppt
- bindsym semicolon resize grow width 10 px or 10 ppt
-
- # same bindings, but for the arrow keys
- bindsym Left resize shrink width 10 px or 10 ppt
- bindsym Down resize grow height 10 px or 10 ppt
- bindsym Up resize shrink height 10 px or 10 ppt
- bindsym Right resize grow width 10 px or 10 ppt
-
- # back to normal: Enter or Escape or $mod+r
- bindsym Return mode "default"
- bindsym Escape mode "default"
- bindsym $mod+r mode "default"
-}
-
-bindsym $mod+r mode "resize"
-
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-bar {
- status_command i3status
-}
-
-# Assign stuff to workspaces
-# tip: use xprop to get window information, e.g WM_CLASS
-assign [class="(?i)slack"] 1
-
-bindsym $mod+x move workspace to output next
-
-## Screenshots
-bindsym Print exec --no-startup-id /home/jras/.nix-profile/bin/maim "/home/$USER/Pictures/screenshots/$(date)"
-bindsym $mod+Print exec --no-startup-id /home/jras/.nix-profile/bin/maim --window $(xdotool getactivewindow) "/home/$USER/Pictures/screenshots/$(date)"
-bindsym Shift+Print exec --no-startup-id /home/jras/.nix-profile/bin/maim --select "/home/$USER/Pictures/screenshots/$(date)"
-
-## Clipboard Screenshots
-bindsym Ctrl+Print exec --no-startup-id /home/jras/.nix-profile/bin/maim | xclip -selection clipboard -t image/png
-bindsym Ctrl+$mod+Print exec --no-startup-id /home/jras/.nix-profile/bin/maim --window $(xdotool getactivewindow) | xclip -selection clipboard -t image/png
-bindsym Ctrl+Shift+Print exec --no-startup-id /home/jras/.nix-profile/bin/maim --select | xclip -selection clipboard -t image/png
-
-default_border pixel 3
diff --git a/home-manager/entrypoints/personal.nix b/home-manager/entrypoints/personal.nix
index 005322b..b49dd6d 100644
--- a/home-manager/entrypoints/personal.nix
+++ b/home-manager/entrypoints/personal.nix
@@ -2,21 +2,17 @@
{
imports = [
../common.nix
- ../compositor/hyprland.nix
];
home.username = "jras";
home.homeDirectory = "/home/jras";
home.stateVersion = "23.11";
home.packages = [
- pkgs.google-chrome
pkgs.hugo
pkgs.dart-sass
pkgs.tailwindcss
pkgs.tailwindcss-language-server
pkgs.vscode-langservers-extracted
- pkgs.font-awesome
- pkgs.pinentry-gnome3
];
programs.git = {
@@ -24,8 +20,6 @@
userEmail = "jaspert.ras@gmail.com";
};
- programs.alacritty.enable = true;
-
programs.helix = {
languages = {
language = [
@@ -61,10 +55,4 @@
};
programs.zsh.envExtra = "export PATH=$HOME/bin:$PATH";
-
- programs.rbw.enable = true;
- programs.rbw.settings = {
- email = "jaspert.ras@gmail.com";
- pinentry = pkgs.pinentry-gnome3;
- };
}
diff --git a/home-manager/entrypoints/work.nix b/home-manager/entrypoints/work.nix
index 6a08059..edf5d50 100644
--- a/home-manager/entrypoints/work.nix
+++ b/home-manager/entrypoints/work.nix
@@ -4,34 +4,12 @@
../systemd/llama.nix
../hostnet.nix
../programming-languages/php.nix
- ../systemd/docker.nix
];
home.username = "jras";
home.homeDirectory = "/home/jras";
home.stateVersion = "22.11";
home.sessionPath = [ "$HOME/.local/bin" "$HOME/.plenv/bin" ];
- home.sessionVariables = {
- TERMINAL = "alacritty";
- TERM = "alacritty-direct";
- };
-
- home.packages = [
- pkgs.git-review
- pkgs.hexchat
- pkgs.nodejs_20
- pkgs.obsidian
- pkgs.apacheHttpd
- pkgs.moonlight-qt
- pkgs.brightnessctl
- pkgs.xflux
- pkgs.hugo
- pkgs.docker
- pkgs.docker-compose
- ];
-
- fonts.fontconfig.enable = true;
- targets.genericLinux.enable = true;
programs.git = {
userName = "Jasper Ras";
@@ -105,11 +83,4 @@
executable = true;
};
};
-
- xsession = {
- enable = true;
- initExtra = ''
- export TERMINAL=alacritty
- '';
- };
}
diff --git a/home-manager/neovim/chatgpt.lua b/home-manager/neovim/chatgpt.lua
deleted file mode 100644
index c71d690..0000000
--- a/home-manager/neovim/chatgpt.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-local home = vim.fn.expand("$HOME")
-
-require("chatgpt").setup({
- api_key_cmd = "gpg --decrypt " .. home .. "/.vim-chatgpt.gpg"
-})
diff --git a/home-manager/neovim/copilot-vim.lua b/home-manager/neovim/copilot-vim.lua
deleted file mode 100644
index 6b08971..0000000
--- a/home-manager/neovim/copilot-vim.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-vim.g.copilot_no_tab_map = true
-vim.api.nvim_set_keymap("i", "<C-y>", 'copilot#Accept("<CR>")', { silent = true, expr = true })
-
-vim.g.copilot_filetypes = {
- ['*'] = false,
- ['python'] = true,
- ['go'] = true,
- ['php'] = true,
- ['yaml'] = true,
-}
diff --git a/home-manager/neovim/harpoon.lua b/home-manager/neovim/harpoon.lua
deleted file mode 100644
index 0e589f2..0000000
--- a/home-manager/neovim/harpoon.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-local mark = require'harpoon.mark'
-local ui = require'harpoon.ui'
-
-vim.keymap.set('n', '<leader>a', function() mark.add_file() end)
-vim.keymap.set('n', '<leader>m', function() ui.toggle_quick_menu() end)
-vim.keymap.set('n', '<leader>b', function() ui.nav_next() end)
-vim.keymap.set('n', '<leader>n', function() ui.nav_prev() end)
-vim.keymap.set('n', '<leader>h', function() ui.nav_file(1) end)
-vim.keymap.set('n', '<leader>j', function() ui.nav_file(2) end)
-vim.keymap.set('n', '<leader>k', function() ui.nav_file(3) end)
-vim.keymap.set('n', '<leader>l', function() ui.nav_file(4) end)
-
diff --git a/home-manager/neovim/init.lua b/home-manager/neovim/init.lua
deleted file mode 100644
index 24504b9..0000000
--- a/home-manager/neovim/init.lua
+++ /dev/null
@@ -1,38 +0,0 @@
--- Recommended per nvim-tree-lua
-vim.g.loaded_netrw = 1
-vim.g.loaded_netrwPlugin = 1
-
--- Set default theme
-vim.o.termguicolors = true
-vim.cmd("colorscheme catppuccin-frappe")
-
--- System clipboard copy and paste
-vim.keymap.set('v', '<leader>y', '"+y')
-vim.keymap.set('n', '<leader>Y', '"+yg_')
-vim.keymap.set('n', '<leader>y', '"+y')
-vim.keymap.set('n', '<leader>yy', '"+yy')
-vim.keymap.set('n', '<leader>p', '"+p')
-vim.keymap.set('n', '<leader>P', '"+P')
-vim.keymap.set('v', '<leader>p', '"+p')
-vim.keymap.set('v', '<leader>P', '"+P')
-
--- Try to keep our cursor centered
-vim.keymap.set('n', 'j', 'jzz')
-vim.keymap.set('n', 'k', 'kzz')
-vim.keymap.set('n', '<C-d>', '<C-d>zz')
-vim.keymap.set('n', '<C-u>', '<C-u>zz')
-
--- Splits
-vim.keymap.set('n', '<leader>d', ':split<CR>')
-vim.keymap.set('n', '<leader>s', ':vsplit<CR>')
-
--- :he listchars
-vim.opt.listchars = {
- trail = '*',
- space = 'ˑ',
- tab = '▷▷⋮',
-}
-vim.keymap.set('n', '<leader><TAB><TAB>', ':set invlist<CR>')
-
-vim.opt.colorcolumn = "120"
-
diff --git a/home-manager/neovim/lsp-zero-nvim.lua b/home-manager/neovim/lsp-zero-nvim.lua
deleted file mode 100644
index 2abd191..0000000
--- a/home-manager/neovim/lsp-zero-nvim.lua
+++ /dev/null
@@ -1,66 +0,0 @@
-local lsp = require('lsp-zero').preset({
- manage_nvim_cmp = {
- set_sources = 'recommended',
- }
-})
-
-lsp.on_attach(function(client, bufnr)
- local opts = {buffer = bufnr}
-
- lsp.default_keymaps(opts)
-
- vim.keymap.set('n', 'gd', '<cmd>Telescope lsp_definitions<cr>', opts)
- vim.keymap.set('n', 'gi', '<cmd>Telescope lsp_implementations<cr>', opts)
- vim.keymap.set('n', 'gr', '<cmd>Telescope lsp_references<cr>', opts)
- vim.keymap.set('n', '<F5>', '<cmd>LspRestart<cr>', opts)
-end)
-
--- When you don't have mason.nvim installed
--- You'll need to list the servers installed in your system
-lsp.setup_servers({'nixd', 'pyright', 'phpactor', 'gopls', 'lua_ls', 'ansiblels'})
-
--- (Optional) Configure lua language server for neovim
-local lspconfig = require('lspconfig')
-lspconfig.lua_ls.setup {
- settings = {
- Lua = {
- runtime = {
- -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
- version = 'LuaJIT',
- },
- diagnostics = {
- -- Get the language server to recognize the `vim` global
- globals = {'vim'},
- },
- workspace = {
- -- Make the server aware of Neovim runtime files
- library = vim.api.nvim_get_runtime_file("", true),
- checkThirdParty = false,
- },
- -- Do not send telemetry data containing a randomized but unique identifier
- telemetry = {
- enable = false,
- },
- },
- },
-}
-
-lsp.setup()
-
-local cmp = require('cmp')
-local cmp_action = require('lsp-zero').cmp_action()
-
-cmp.setup({
- sources = {
- {name = 'nvim_lsp'},
- {name = 'nvim_lua'},
- },
- mapping = {
- ['<CR>'] = cmp.mapping.confirm({select = false}),
- ['<C-f>'] = cmp_action.luasnip_jump_forward(),
- ['<C-b>'] = cmp_action.luasnip_jump_backward(),
- ['<Tab>'] = cmp_action.luasnip_supertab(),
- ['<S-Tab>'] = cmp_action.luasnip_shift_supertab(),
- },
-})
-
diff --git a/home-manager/neovim/nvim-tree-lua.lua b/home-manager/neovim/nvim-tree-lua.lua
deleted file mode 100644
index 9911ba3..0000000
--- a/home-manager/neovim/nvim-tree-lua.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-require('nvim-tree').setup {}
-
-local api = require'nvim-tree.api'
-vim.keymap.set('n', '<Tab>', function () api.tree.open({ find_file = true }) end)
diff --git a/home-manager/neovim/nvim-treesitter.lua b/home-manager/neovim/nvim-treesitter.lua
deleted file mode 100644
index 6bc8fbb..0000000
--- a/home-manager/neovim/nvim-treesitter.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-require'nvim-treesitter.configs'.setup {
- -- Automatically install missing parsers when entering buffer
- -- False because we install them via Nix.
- auto_install = false,
- highlight = {
- enable = true,
- additional_vim_regex_highlighting = false,
- },
-}
diff --git a/home-manager/neovim/nvim-web-devicons.lua b/home-manager/neovim/nvim-web-devicons.lua
deleted file mode 100644
index 57051fb..0000000
--- a/home-manager/neovim/nvim-web-devicons.lua
+++ /dev/null
@@ -1 +0,0 @@
-require'nvim-web-devicons'.setup {}
diff --git a/home-manager/neovim/telescope-nvim.lua b/home-manager/neovim/telescope-nvim.lua
deleted file mode 100644
index eeaf87e..0000000
--- a/home-manager/neovim/telescope-nvim.lua
+++ /dev/null
@@ -1,18 +0,0 @@
-local telescope = require'telescope'
-telescope.setup {
- extensions = {
- file_browser = {
- theme = "ivy",
- hijack_netrw = true,
- },
- },
-}
-telescope.load_extension "file_browser"
-
-local api = require('telescope.builtin')
-vim.keymap.set('n', '<leader>f', function() api.find_files{hidden=true} end, {})
-vim.keymap.set('n', '<leader>g', api.live_grep, {})
-vim.keymap.set('n', '<leader>B', api.buffers, {})
-vim.keymap.set('n', '<leader>H', api.help_tags, {})
-
-vim.api.nvim_set_keymap("n", "<Tab>", ":Telescope file_browser path=%:p:h select_buffer=true<CR>", { noremap = true })
diff --git a/home-manager/systemd/docker.nix b/home-manager/systemd/docker.nix
deleted file mode 100644
index a0cd2d1..0000000
--- a/home-manager/systemd/docker.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ config, lib, pkgs, ... }: {
- systemd.user.services.docker = {
- Unit.Description = "Docker Application Container Engine (Rootless)";
- Service = {
- ExecStart =
- "${config.home.profileDirectory}/bin/dockerd-rootless --experimental --storage-driver=overlay2";
- ExecReload = "/bin/kill -s HUP $MAINPID";
- TimeoutSec = "0";
- RestartSec = "2";
- Restart = "always";
- StartLimitBurst = "3";
- StartLimitInterval = "60s";
- LimitNOFILE = "infinity";
- LimitNPROC = "infinity";
- LimitCORE = "infinity";
- TasksMax = "infinity";
- Delegate = "yes";
- Type = "simple";
- };
- Install.WantedBy = [ "default.target" ];
- };
-}
diff --git a/hosts/work.nix b/hosts/work.nix
index d0b97cc..f4269ec 100644
--- a/hosts/work.nix
+++ b/hosts/work.nix
@@ -4,6 +4,13 @@
environment.systemPackages = with pkgs; [
slack
+ git-review
+ hexchat
+ obsidian
+ apacheHttpd
+ moonlight-qt
+ brightnessctl
+ hugo
];
hardware.bluetooth.enable = true;
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-16 10:03:07 +0000