Merge branch 'main' of git.jhink.org:jacob/nix_config

home/jacob.nix

@@ -174,34 +174,7 @@
     mbsync = {
       enable = true;
     };
-    neovim = {
+    neovim = (import ./neovim.nix) 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
-      '';
-      plugins = with pkgs.vimPlugins; [
-        #context-vim
-        #ctrlp
-        #fzf
-        #gundo
-        python-mode
-        #telescope-nvim
-        #telescope-fzf-native-nvim
-        #nvim-treesitter
-        vim-nix
-      ];
-      vimAlias = true;
-    };
     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" ];
+      extraOptions = [ "--wait" ];
-      tray.enable = false;
+      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;

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 <leader>n :lnext<CR>
+    map <leader>p :lprev<CR>
+  '';
+  plugins = with pkgs.vimPlugins; [
+    #context-vim
+    #ctrlp
+    #fzf
+    #gundo
+    python-mode
+    #telescope-nvim
+    #telescope-fzf-native-nvim
+    #nvim-treesitter
+    vim-nix
+  ];
+  vimAlias = true;
+}

home/qutebrowser.nix

@@ -22,6 +22,9 @@
     normal = {
       "<Shift-J>" = "tab-prev";
       "<Shift-K>" = "tab-next";
+      ",s" = "set-cmd-text -s :session-save -o";
+      ",o" = "set-cmd-text -s :session-load";
+      ",d" = "set-cmd-text -s :session-delete";
     };
   };
 }

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;