diff --git a/home/jacob.nix b/home/jacob.nix index a067fad..4470ef4 100644 --- a/home/jacob.nix +++ b/home/jacob.nix @@ -174,34 +174,7 @@ mbsync = { enable = true; }; - neovim = { - enable = true; - extraConfig = '' - set tabstop=4 - set softtabstop=4 " enables backspacing, etc - set shiftwidth=4 - set expandtab - set tw=80 - - set bs=2 " allow backspacing over everything in insert mode - set ai " always set autoindenting on - - set number relativenumber - set colorcolumn=100 - ''; - plugins = with pkgs.vimPlugins; [ - #context-vim - #ctrlp - #fzf - #gundo - python-mode - #telescope-nvim - #telescope-fzf-native-nvim - #nvim-treesitter - vim-nix - ]; - vimAlias = true; - }; + neovim = (import ./neovim.nix) pkgs; notmuch = { enable = true; }; @@ -278,6 +251,16 @@ }; services = { + betterlockscreen = { + enable = true; + arguments = [ + "--fx ''" # don't apply effects + ]; + }; + dunst = { + enable = true; + }; + flameshot.enable = true; mbsync = { enable = true; verbose = true; @@ -298,8 +281,19 @@ syncthing = { enable = false; # cause the tray command to wait for the service and tray manager to start - #extraOptions = [ "--wait" ]; - tray.enable = false; + extraOptions = [ "--wait" ]; + tray.enable = true; + }; + trayer = { + enable = true; + settings = { + align = "right"; + edge = "top"; + tint = "black"; + transparent = true; # only way i could get color to work + widthtype = "percent"; + width = "10"; + }; }; unclutter = { enable = true; diff --git a/home/neovim.nix b/home/neovim.nix new file mode 100644 index 0000000..728e43a --- /dev/null +++ b/home/neovim.nix @@ -0,0 +1,34 @@ +pkgs: { + enable = true; + extraConfig = '' + set tabstop=4 + set softtabstop=4 " enables backspacing, etc + set shiftwidth=4 + set expandtab + set tw=80 + + set bs=2 " allow backspacing over everything in insert mode + set ai " always set autoindenting on + + set number relativenumber + set colorcolumn=100 + + let g:pymode_options_max_line_length=95 + + let mapleader = ',' + map n :lnext + map p :lprev + ''; + plugins = with pkgs.vimPlugins; [ + #context-vim + #ctrlp + #fzf + #gundo + python-mode + #telescope-nvim + #telescope-fzf-native-nvim + #nvim-treesitter + vim-nix + ]; + vimAlias = true; +} diff --git a/home/qutebrowser.nix b/home/qutebrowser.nix index ce2e6c7..0e36c03 100644 --- a/home/qutebrowser.nix +++ b/home/qutebrowser.nix @@ -22,6 +22,9 @@ normal = { "" = "tab-prev"; "" = "tab-next"; + ",s" = "set-cmd-text -s :session-save -o"; + ",o" = "set-cmd-text -s :session-load"; + ",d" = "set-cmd-text -s :session-delete"; }; }; } diff --git a/machines/buck/configuration.nix b/machines/buck/configuration.nix index d3b40c0..9b568c9 100644 --- a/machines/buck/configuration.nix +++ b/machines/buck/configuration.nix @@ -111,7 +111,7 @@ # Define a user account. Don't forget to set a password with ‘passwd’. users.users.jacob = { isNormalUser = true; - extraGroups = ["wheel"]; # Enable ‘sudo’ for the user. + extraGroups = [ "video" "wheel" ]; # Enable ‘sudo’ for the user. shell = pkgs.zsh; }; @@ -137,6 +137,10 @@ syncthing = import ./syncthing.nix; + udev.extraRules = '' + ACTION=="add", SUBSYSTEM=="backlight", KERNEL=="intel_backlight", MODE="0666", RUN+="${pkgs.coreutils}/bin/chmod a+w /sys/class/backlight/%k/brightness" + ''; + # Enable the X11 windowing system. services.xserver.enable = true; xserver = { enable = true;