Update to NixOS 22.11 and set syncthing user=jacob

flake.lock

@@ -8,11 +8,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1666649150,
-        "narHash": "sha256-kINnLxC0KFalUk4tVO/H5hUU7FVAOYYcUSWrsBpnl+I=",
+        "lastModified": 1671459164,
+        "narHash": "sha256-RbkDnvLV7WjbiF4Dpiezrf8kXxwieQXAVtY8ciRQj6Q=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7dc4e4ebd71280842b4d30975439980baaac9db8",
+        "rev": "e7eba9cc46547ae86642ad3c6a9a4fb22c07bc26",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1665987993,
-        "narHash": "sha256-MvlaIYTRiqefG4dzI5p6vVCfl+9V8A1cPniUjcn6Ngc=",
+        "lastModified": 1671467847,
+        "narHash": "sha256-eIeZIQbbW0QYDW0nhDaieokw6VakPO3TyJ3RmxqGHOs=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "0e6593630071440eb89cd97a52921497482b22c6",
+        "rev": "25010a042c23695ae457a97aad60e9b1d49f2ecc",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1666709108,
-        "narHash": "sha256-fBCVW1SpaAav6V8V99tHLeZefCAEAaOvD70Gb2H/D4U=",
+        "lastModified": 1669833724,
+        "narHash": "sha256-/HEZNyGbnQecrgJnfE8d0WC5c1xuPSD2LUpB6YXlg4c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9237fad40957a5ec3d6d6fb17675c1eae6743497",
+        "rev": "4d2b37a84fad1091b9de401eb450aae66f1a741e",
         "type": "github"
       },
       "original": {
@@ -51,18 +51,18 @@
         "type": "github"
       }
     },
-    "nixpkgs-22_05": {
+    "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1666610816,
-        "narHash": "sha256-q4F2VNe5bpxXOvp16DyLwE1SgNZMbNO29ZQJPIomedg=",
+        "lastModified": 1671459584,
+        "narHash": "sha256-6wRK7xmeHfClJ0ICOkax1avLZVGTDqBodQlkl/opccY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6107f97012a0c134c5848125b5aa1b149b76d2c9",
+        "rev": "87b58217c9a05edcf7630b9be32570f889217aef",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-22.05",
+        "ref": "release-22.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -80,14 +80,14 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-22_05": "nixpkgs-22_05"
+        "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1665289655,
-        "narHash": "sha256-j1Q9mNBhbzeJykhObiXwEGres9qvP4vH7gxdJ+ihkLI=",
+        "lastModified": 1671472949,
+        "narHash": "sha256-9iHSGpljCX+RypahQssBXPwkru9onfKfceCTeVrMpH4=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "0ce0449e6404c4ff9d1b7bd657794ae5ca54deb3",
+        "rev": "32840f16ffa0856cdf9503a8658f2dd42bf70342",
         "type": "github"
       },
       "original": {
@@ -98,11 +98,11 @@
     },
     "utils": {
       "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -5,7 +5,6 @@
     nixpkgs.url = github:nixos/nixpkgs;
     nixos-hardware = {
       url = github:nixos/nixos-hardware;
-      inputs.nixpkgs.follows = "nixpkgs";
     };
     home-manager = {
       url = github:nix-community/home-manager;

home/jacob.nix

@@ -34,6 +34,7 @@
       #freecad
       fzf
       #gnumake
+      gxkb
       hack-font
       inconsolata
       jq
@@ -217,6 +218,10 @@
           user = "4jh";
           proxyJump = "login1";
         };
+        penny = {
+          hostname = "192.168.88.41";
+          user = "jhinkle";
+        };
       };
     };
     tmux = import ./tmux.nix;

home/neovim.nix

@@ -27,6 +27,108 @@ pkgs: {
     " temporary fix for broken popup menu colors
     " see here: https://github.com/nvim-telescope/telescope.nvim/issues/2145
     hi NormalFloat ctermfg=LightGrey
+
+    " trouble.nvim settings
+    nnoremap <leader>xx <cmd>TroubleToggle<cr>
+    nnoremap <leader>xw <cmd>TroubleToggle workspace_diagnostics<cr>
+    nnoremap <leader>xd <cmd>TroubleToggle document_diagnostics<cr>
+    nnoremap <leader>xq <cmd>TroubleToggle quickfix<cr>
+    nnoremap <leader>xl <cmd>TroubleToggle loclist<cr>
+    nnoremap gR <cmd>TroubleToggle lsp_references<cr>
+
+    lua << EOF
+      require 'lspconfig'
+
+      -- rust setup from https://sharksforarms.dev/posts/neovim-rust/
+      -- Set completeopt to have a better completion experience
+      -- :help completeopt
+      -- menuone: popup even when there's only one match
+      -- noinsert: Do not insert text until a selection is made
+      -- noselect: Do not auto-select, nvim-cmp plugin will handle this for us.
+      vim.o.completeopt = "menuone,noinsert,noselect"
+
+      -- Avoid showing extra messages when using completion
+      vim.opt.shortmess = vim.opt.shortmess + "c"
+
+      local function on_attach(client, buffer)
+        -- This callback is called when the LSP is atttached/enabled for this buffer
+        -- we could set keymaps related to LSP, etc here.
+      end
+
+      -- Configure LSP through rust-tools.nvim plugin.
+      -- rust-tools will configure and enable certain LSP features for us.
+      -- See https://github.com/simrat39/rust-tools.nvim#configuration
+      local opts = {
+        tools = {
+          runnables = {
+            use_telescope = true,
+          },
+          inlay_hints = {
+            auto = true,
+            show_parameter_hints = true,
+            parameter_hints_prefix = "",
+            other_hints_prefix = "",
+          },
+          virt_text = {{"demo", "IncSearch"}},
+          virt_text_pos = 'overlay',
+        },
+
+        -- all the opts to send to nvim-lspconfig
+        -- these override the defaults set by rust-tools.nvim
+        -- see https://github.com/neovim/nvim-lspconfig/blob/master/CONFIG.md#rust_analyzer
+        server = {
+          -- on_attach is a callback called when the language server attachs to the buffer
+          on_attach = on_attach,
+          settings = {
+            -- to enable rust-analyzer settings visit:
+            -- https://github.com/rust-analyzer/rust-analyzer/blob/master/docs/user/generated_config.adoc
+            ["rust-analyzer"] = {
+              -- enable clippy on save
+              checkOnSave = {
+                command = "clippy",
+              },
+            },
+          },
+        },
+      }
+
+      require("rust-tools").setup(opts)
+
+      -- Setup Completion
+      -- See https://github.com/hrsh7th/nvim-cmp#basic-configuration
+      local cmp = require("cmp")
+      cmp.setup({
+        preselect = cmp.PreselectMode.None,
+        snippet = {
+          expand = function(args)
+            vim.fn["vsnip#anonymous"](args.body)
+          end,
+        },
+        mapping = {
+          ["<C-p>"] = cmp.mapping.select_prev_item(),
+          ["<C-n>"] = cmp.mapping.select_next_item(),
+          -- Add tab support
+          ["<S-Tab>"] = cmp.mapping.select_prev_item(),
+          ["<Tab>"] = cmp.mapping.select_next_item(),
+          ["<C-d>"] = cmp.mapping.scroll_docs(-4),
+          ["<C-f>"] = cmp.mapping.scroll_docs(4),
+          ["<C-Space>"] = cmp.mapping.complete(),
+          ["<C-e>"] = cmp.mapping.close(),
+          ["<CR>"] = cmp.mapping.confirm({
+            behavior = cmp.ConfirmBehavior.Insert,
+            select = true,
+          }),
+        },
+
+        -- Installed sources
+        sources = {
+          { name = "nvim_lsp" },
+          { name = "vsnip" },
+          { name = "path" },
+          { name = "buffer" },
+        },
+      })
+    EOF
   '';
   plugins = with pkgs.vimPlugins; [
     #context-vim
@@ -38,6 +140,19 @@ pkgs: {
     telescope-fzf-native-nvim
     #nvim-treesitter
     vim-nix
+
+    # rust stuff
+    nvim-lspconfig
+    nvim-cmp
+    cmp-nvim-lsp
+    cmp-vsnip
+    cmp-path
+    cmp-buffer
+    vim-vsnip
+    rust-tools-nvim
+    trouble-nvim
+    nvim-web-devicons
   ];
   vimAlias = true;
+  withPython3 = true;
 }

home/qutebrowser.nix

@@ -17,6 +17,8 @@
               pass
 
     qutebrowser.api.interceptor.register(rewrite)
+
+    c.session.lazy_restore = True
   '';
   keyBindings = {
     normal = {

home/xmobarrc

@@ -1,6 +1,6 @@
 Config { overrideRedirect = False
        , font     = "xft:iosevka-9"
-       , bgColor  = "#1f1f1f"
+       , bgColor  = "#000000"
        , fgColor  = "#f8f8f2"
        , position = TopW L 90
        , commands = [

home/xmonad.hs

@@ -6,6 +6,7 @@ import XMonad.Actions.RotSlaves
 
 import XMonad.Hooks.DynamicLog
 import XMonad.Hooks.EwmhDesktops
+import XMonad.Hooks.ManageDocks
 import XMonad.Hooks.StatusBar
 import XMonad.Hooks.StatusBar.PP
 
@@ -21,7 +22,6 @@ main :: IO ()
 main = xmonad
     . ewmhFullscreen 
     . ewmh 
---    . xmobarProp
     . withEasySB (statusBarProp "xmobar" (pure myXmobarPP)) defToggleStrutsKey
     $ myConfig
 

machines/buck/syncthing.nix

@@ -1,5 +1,6 @@
 {
   enable = true;
+  user = "jacob";
   dataDir = "/home/jacob/Sync";
   #guiAddress = "0.0.0.0:8234";  # for headless
 }