Compare commits

..

No commits in common. "f986493354fce76ffa79e7e551f1800453c149e3" and "6f505c1c3363b57e1b58fba9588a4f3801a7ea96" have entirely different histories.

8 changed files with 42 additions and 88 deletions

View File

@ -1,40 +1,12 @@
call plug#begin('~/.config/nvim/plugged')
Plug 'sonph/onehalf', { 'rtp': 'vim' }
Plug 'vifm/vifm.vim'
Plug 'preservim/nerdtree'
Plug 'airblade/vim-gitgutter'
Plug 'jiangmiao/auto-pairs'
"Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'sheerun/vim-polyglot'
Plug 'itchyny/lightline.vim'
call plug#end()
syntax on
colorscheme onehalfdark
" lightline
let g:lightline = {
\ 'colorscheme': 'onehalfdark',
\ 'active': {
\ 'left': [ [ 'mode', 'paste' ],
\ [ 'readonly', 'filename', 'modified' ] ]
\ },
\ 'component': {
\ 'helloworld': 'Hello, world!'
\ },
\ }
set number
set relativenumber
set tabstop=4 softtabstop=0
set tabstop=4 softtabstop=4
set shiftwidth=4
set expandtab
set smartindent
set ignorecase
set incsearch
set scrolloff=8
set noshowmode
"set colorcolumn=80
"set mouse=a
"set clipboard=unnamedplus

View File

@ -95,15 +95,15 @@ super + ctrl + {m,x,y,z}
#
# Focus the node in the given direction
#super + {Left,Down,Up,Right}
# bspc node -f {west,south,north,east}
super + {Left,Down,Up,Right}
bspc node -f {west,south,north,east}
super + {h, j, k, l}
bspc node -f {west,south,north,east}
# Move the node to the given direction
#super + shift + {Left,Down,Up,Right}
# bspc node -s {west,south,north,east}
super + shift + {Left,Down,Up,Right}
bspc node -s {west,south,north,east}
super + shift + {h, j, k, l}
bspc node -s {west,south,north,east}

1
.gitignore vendored
View File

@ -1 +0,0 @@
.config/nvim/plugged

39
nixos/configuration.nix → configuration.nix Normal file → Executable file
View File

@ -23,6 +23,8 @@ programs.nix-ld.enable = true;
#networking.hostName = "nixos"; # Define your hostname.
networking.networkmanager.enable = true;
#networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Set your time zone.
@ -46,6 +48,8 @@ programs.nix-ld.enable = true;
# keyMap = "us";
# };
# Enable the X11 windowing system.
services.xserver = {
enable = true;
@ -61,17 +65,23 @@ programs.nix-ld.enable = true;
autoRepeatDelay = 200;
autoRepeatInterval = 35;
windowManager.bspwm.enable = true;
#desktopManager.xterm.enable = true;
displayManager.defaultSession = "none+bspwm";
# gnome
#displayManager.gdm.enable = true;
#desktopManager.gnome.enable = true;
displayManager.defaultSession = "none+bspwm";
#displayManager.startx.enable = true;
libinput = {
# Enable touchpad support (enabled default in most desktopManager).
enable = true;
touchpad.accelSpeed = "0.155";
};
};
virtualisation.docker.enable = true;
# Enable CUPS to print documents.
@ -96,7 +106,7 @@ programs.nix-ld.enable = true;
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
environment.systemPackages = with pkgs; [
# editors
vim
neovim
@ -151,8 +161,30 @@ programs.nix-ld.enable = true;
python311
geany
nasm
# tmp
# gsettings-desktop-schemas
];
# environment.gnome.excludePackages = (with pkgs; [
# gnome-photos
# gnome-tour
# ]) ++ (with pkgs.gnome; [
# cheese # webcam tool
# gnome-music
# gnome-terminal
# gedit # text editor
# epiphany # web browser
# geary # email reader
# evince # document viewer
# gnome-characters
# totem # video player
# tali # poker game
# iagno # go game
# hitori # sudoku game
# atomix # puzzle game
# ]);
fonts.fonts = [ pkgs.font-awesome ];
nixpkgs.config.allowUnfree = true;
@ -165,7 +197,6 @@ programs.nix-ld.enable = true;
enable = true;
theme = "candy-kingdom";
};
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;

View File

@ -1,27 +0,0 @@
{
services.xserver = {
displayManager.gdm.enable = true;
desktopManager.gnome.enable = true;
}
environment.gnome.excludePackages = (with pkgs; [
gnome-photos
gnome-tour
]) ++ (with pkgs.gnome; [
cheese
gnome-music
gnome-terminal
gedit
epiphany
geary
evince
gnome-characters
totem
tali
iagno
hitori
atomix
]);
}

View File

@ -1,21 +0,0 @@
{ config, lib, pkgs, ...}: with lib;
{
services.xserver = {
desktopManager.xfce = {
enable = true;
enableXfwm = false;
};
windowManager.bspwm.enable = true;
#iwindowManager.bspwm.configFile = "/home/grimhilt/dotfiles/common/bspwm/bspwmrc";
#windowManager.bspwm.sxhkd.configFile = "/home/grimhilt/dotfiles/common/bspwm/sxhkdrc";
desktopManager.xterm.enable = false;
};
#services.xserver.displayManager.defaultSession = "none+bspwm";
}