install solaar for use on yukari

dotfiles/nvim/.neoconf.json

@@ -1,15 +0,0 @@
-{
-  "neodev": {
-    "library": {
-      "enabled": true,
-      "plugins": true
-    }
-  },
-  "neoconf": {
-    "plugins": {
-      "lua_ls": {
-        "enabled": true
-      }
-    }
-  }
-}

dotfiles/nvim/init.lua

@@ -1 +0,0 @@
-require("config.lazy")

dotfiles/nvim/lua/config/autocmds.lua

@@ -1,3 +0,0 @@
--- Autocmds are automatically loaded on the VeryLazy event
--- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua
--- Add any additional autocmds here

dotfiles/nvim/lua/config/keymaps.lua

@@ -1,3 +0,0 @@
--- Keymaps are automatically loaded on the VeryLazy event
--- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
--- Add any additional keymaps here

dotfiles/nvim/lua/config/lazy.lua

@@ -1,45 +0,0 @@
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-  -- bootstrap lazy.nvim
-  -- stylua: ignore
-  vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath })
-end
-vim.opt.rtp:prepend(vim.env.LAZY or lazypath)
-
-require("lazy").setup({
-	spec = {
-		-- add LazyVim and import its plugins
-		{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
-		-- import any extras modules here
-		{ import = "lazyvim.plugins.extras.editor.aerial" },
-		{ import = "lazyvim.plugins.extras.editor.leap" },
-		{ import = "lazyvim.plugins.extras.lang.typescript" },
-		{ import = "lazyvim.plugins.extras.lang.svelte" },
-		{ import = "lazyvim.plugins.extras.lang.rust" },
-		{ import = "lazyvim.plugins.extras.lang.haskell" },
-		{ import = "lazyvim.plugins.extras.formatting.prettier" },
-		-- import/override with your plugins
-		{ import = "plugins" },
-	},
-	defaults = {
-		lazy = false,
-		version = false, -- always use the latest git commit
-	},
-	install = { colorscheme = { "tokyonight", "habamax" } },
-	checker = { enabled = true }, -- automatically check for plugin updates
-	performance = {
-		rtp = {
-			-- disable some rtp plugins
-			disabled_plugins = {
-				"gzip",
-				-- "matchit",
-				-- "matchparen",
-				-- "netrwPlugin",
-				"tarPlugin",
-				"tohtml",
-				"tutor",
-				"zipPlugin",
-			},
-		},
-	},
-})

dotfiles/nvim/lua/config/options.lua

@@ -1,22 +0,0 @@
--- Options are automatically loaded before lazy.nvim startup
--- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua
--- Add any additional options here
-
--- Disable relative line numbers
-vim.o.relativenumber = false
-
--- Change the default font
--- Some of my machines have HDR displayed, meaning they need a smaller font size
-if vim.fn.hostname() == "enoko" then
-  vim.o.guifont = "JetBrainsMono NF:h12"
-else
-  vim.o.guifont = "JetBrainsMono NF:h14"
-end
-
-if vim.g.neovide then
-  -- Reduce neovide scroll animation length
-  vim.g.neovide_scroll_animation_length = 0.1
-end
-
--- Prepend mise shims to path
-vim.env.PATH = vim.env.HOME .. ".local/share/mise/shims:" .. vim.env.PATH

dotfiles/nvim/lua/plugins/cmp.lua

@@ -1,9 +0,0 @@
-return {
-  "hrsh7th/nvim-cmp",
-  opts = function(_, opts)
-    opts.experimental = {
-      -- Disable ghost text because it pisses me off.
-      ghost_text = false,
-    }
-  end,
-}

dotfiles/nvim/lua/plugins/colorscheme.lua

@@ -1,9 +0,0 @@
-return {
-  { "catppuccin/nvim" },
-  {
-    "LazyVim/LazyVim",
-    opts = {
-      colorscheme = "catppuccin-mocha",
-    },
-  },
-}

dotfiles/nvim/lua/plugins/elixir.lua

@@ -1,17 +0,0 @@
--- Set up elixir-tools.nvim for better Elixir support
-
-return {
-  {
-    "elixir-tools/elixir-tools.nvim",
-    event = { "BufReadPre", "BufNewFile" },
-    config = function()
-      local elixir = require("elixir")
-
-      elixir.setup({
-        elixirls = {
-          enable = false, -- handle elixirls through mason
-        },
-      })
-    end,
-  },
-}

dotfiles/nvim/lua/plugins/keymaps.lua

@@ -1,8 +0,0 @@
--- Override plugin keymaps
-
-return {
-  "nvim-telescope/telescope.nvim",
-  keys = {
-    { "<leader><space>", "<cmd>Telescope find_files<cr>", desc = "Find files" },
-  },
-}

dotfiles/nvim/lua/plugins/nushell.lua

@@ -1,30 +0,0 @@
-return {
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        nushell = {},
-      },
-    },
-  },
-  {
-    "nvim-treesitter/nvim-treesitter",
-    dependencies = {
-      { "nushell/tree-sitter-nu" },
-    },
-    opts = function(_, opts)
-      require("nvim-treesitter.parsers").get_parser_configs().nu = {
-        install_info = {
-          url = "https://github.com/nushell/tree-sitter-nu",
-          files = { "src/parser.c" },
-          branch = "main",
-        },
-        filetype = "nu",
-      }
-
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "nu" })
-      end
-    end,
-  },
-}

dotfiles/nvim/lua/plugins/projects.lua

@@ -1,42 +0,0 @@
--- Better project/cd support
-
-return {
-  {
-    "gnikdroy/projections.nvim",
-    config = function()
-      require("projections").setup({
-        workspaces = {
-          "~/Projects/Personal",
-        },
-      })
-      require("telescope").load_extension("projections")
-
-      -- Load project if started in a project directory
-      local switcher = require("projections.switcher")
-      vim.api.nvim_create_autocmd({ "VimEnter" }, {
-        callback = function()
-          if vim.fn.argc() == 0 then
-            switcher.switch(vim.loop.cwd())
-          end
-        end,
-      })
-    end,
-    keys = {
-      { "<leader>fp", "<cmd>Telescope projections<CR>", desc = "Search projects" },
-    },
-  },
-  {
-    "nvimdev/dashboard-nvim",
-    opts = function(_, opts)
-      local button = {
-        action = "Telescope projections",
-        desc = "Projects",
-        icon = "🕮  ",
-        key = "p",
-      }
-
-      button.key_format = "  %s"
-      table.insert(opts.config.center, 6, button)
-    end,
-  },
-}

dotfiles/nvim/lua/plugins/tmux.lua

@@ -1,32 +0,0 @@
-return {
-  {
-    "aserowy/tmux.nvim",
-    event = "VeryLazy",
-    config = function()
-      local tmux = require("tmux")
-      tmux.setup({
-        copy_sync = {
-          enable = false,
-        },
-        navigation = {
-          cycle_navigation = false,
-          enable_default_keybindings = false,
-          persist_zoom = true,
-        },
-        resize = {
-          enable_default_keybindings = false,
-        },
-      })
-    end,
-    keys = {
-      { "<c-h>",     mode = { "n", "t", "i" }, '<cmd>lua require("tmux").move_left()<cr>' },
-      { "<c-l>",     mode = { "n", "t", "i" }, '<cmd>lua require("tmux").move_right()<cr>' },
-      { "<c-j>",     mode = { "n", "t", "i" }, '<cmd>lua require("tmux").move_bottom()<cr>' },
-      { "<c-k>",     mode = { "n", "t", "i" }, '<cmd>lua require("tmux").move_top()<cr>' },
-      { "<c-left>",  mode = { "n", "t", "i" }, '<cmd>lua require("tmux").resize_left()<cr>' },
-      { "<c-down>",  mode = { "n", "t", "i" }, '<cmd>lua require("tmux").resize_bottom()<cr>' },
-      { "<c-up>",    mode = { "n", "t", "i" }, '<cmd>lua require("tmux").resize_top()<cr>' },
-      { "<c-right>", mode = { "n", "t", "i" }, '<cmd>lua require("tmux").resize_right()<cr>' },
-    },
-  },
-}

dotfiles/nvim/stylua.toml

@@ -1,3 +0,0 @@
-indent_type = "Spaces"
-indent_width = 2
-column_width = 120

home/features/cli/neovim.nix

@@ -1,24 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.neovim = {
-    enable = true;
-    extraPackages = with pkgs; [
-      # LazyVim
-      lua-language-server
-      stylua
-      # Telescope
-      ripgrep
-    ];
-
-    plugins = with pkgs.vimPlugins; [
-      lazy-nvim
-    ];
-  };
-
-  home.sessionVariables.EDITOR = "nvim";
-
-  xdg.configFile."nvim/init.lua".source = ../../../dotfiles/nvim/init.lua;
-  xdg.configFile."nvim/stylua.toml".source = ../../../dotfiles/nvim/stylua.toml;
-  xdg.configFile."nvim/.neoconf.json".source = ../../../dotfiles/nvim/.neoconf.json;
-  xdg.configFile."nvim/lua".source = ../../../dotfiles/nvim/lua;
-}

home/yukari.nix

@@ -1,6 +1,5 @@
 # yukari my main desktop workstation, running nixos
-{ ... }:
+{ pkgs, ... }: {
-{
   imports = [
     ./global.nix
     ./global.linux.nix
@@ -8,10 +7,13 @@
     ./features/desktop/games
   ];
 
+  # Install Solaar, a management application for Logitech dongle devices
+  home.packages = with pkgs; [ solaar ];
+
   #  ----------   ------
   # | HDMI-A-5 | | DP-5 |
   #  ----------   ------
-  config.monitors = [
+  monitors = [
     {
       name = "HDMI-A-1";
       width = 3440;

nixos/yukari/configuration.nix

@@ -1,11 +1,4 @@
-{
+{ inputs, lib, config, pkgs, ... }: {
-  inputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-{
   imports = [
     ../common
     ./hardware-configuration.nix
@@ -14,31 +7,25 @@
     ../desktop/plasma.nix
   ];
 
-  nixpkgs = {
+  nixpkgs = { config = { allowUnfree = true; }; };
-    config = {
+
-      allowUnfree = true;
+  nix = let flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
+  in {
+    settings = {
+      flake-registry = "";
+      nix-path = config.nix.nixPath;
     };
+    channel.enable = false;
+
+    registry = lib.mapAttrs (_: flake: { inherit flake; }) flakeInputs;
+    nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
   };
 
-  nix =
-    let
-      flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
-    in
-    {
-      settings = {
-        flake-registry = "";
-        nix-path = config.nix.nixPath;
-      };
-      channel.enable = false;
-
-      registry = lib.mapAttrs (_: flake: { inherit flake; }) flakeInputs;
-      nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
-    };
-
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.initrd.kernelModules = [ "amdgpu" ];
   hardware.graphics.enable = true;
+  hardware.logitech.wireless.enable = true;
 
   networking.hostName = "yukari";
 
@@ -66,17 +53,12 @@
     lu = {
       shell = pkgs.fish;
       isNormalUser = true;
-      extraGroups = [
+      extraGroups = [ "wheel" "storage" ];
-        "wheel"
-        "storage"
-      ];
     };
   };
 
   # network stuff
-  networking.networkmanager = {
+  networking.networkmanager = { enable = true; };
-    enable = true;
-  };
 
   # fish shell
   programs.fish = {
@@ -89,9 +71,7 @@
   };
 
   # hyprland stuff
-  programs.hyprland = {
+  programs.hyprland = { enable = true; };
-    enable = true;
-  };
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
   system.stateVersion = "23.11";