hosts/iyokan/default.nix

@@ -1,10 +1,6 @@
-{
+{lib, ...}: {
-  pkgs,
-  lib,
-  ...
-}: {
   imports = [
-    ../../system
+    ../common
     ./hardware-configuration.nix
   ];
 
@@ -15,21 +11,13 @@
     deviceSection = ''Option "TearFree" "true"'';
   };
   hardware.nvidia.open = false;
-  nixpkgs.config.allowUnfree = true;
+  nixpkgs.config.allowUnfreePredicate = pkg:
+    builtins.elem (lib.getName pkg) [
+      "nvidia-x11"
+      "nvidia-settings"
+    ];
   users.users.caandt = {
     isNormalUser = true;
     extraGroups = ["wheel"];
   };
-  environment.systemPackages = [pkgs.nvtopPackages.nvidia];
-  services.openssh = {
-    enable = true;
-    ports = [22];
-    settings = {
-      PasswordAuthentication = true;
-      AllowUsers = null;
-      UseDns = true;
-      X11Forwarding = false;
-      PermitRootLogin = "no";
-    };
-  };
 }

hosts/iyokan/users/caandt/default.nix

@@ -1,33 +1,7 @@
-{
+{...}: {
-  config,
-  pkgs,
-  ...
-}: {
   imports = [
     ../../../../user
   ];
 
-  home.packages = with pkgs; [
-    sshfs
-    graphviz
-    (symlinkJoin {
-      name = "pyenv";
-      paths = [pyenv];
-      buildInputs = [makeWrapper];
-      postBuild = ''
-        wrapProgram $out/bin/pyenv \
-          --set PYENV_ROOT "${config.home.homeDirectory}/.local/pyenv" \
-          --set CPPFLAGS "-I${pkgs.zlib.dev}/include -I${pkgs.libffi.dev}/include -I${pkgs.readline.dev}/include -I${pkgs.bzip2.dev}/include -I${pkgs.openssl.dev}/include" \
-          --set CXXFLAGS "-I${pkgs.zlib.dev}/include -I${pkgs.libffi.dev}/include -I${pkgs.readline.dev}/include -I${pkgs.bzip2.dev}/include -I${pkgs.openssl.dev}/include" \
-          --set CFLAGS "-I${pkgs.openssl.dev}/include" \
-          --set LDFLAGS "-L${pkgs.zlib.out}/lib -L${pkgs.libffi.out}/lib -L${pkgs.readline.out}/lib -L${pkgs.bzip2.out}/lib -L${pkgs.openssl.out}/lib" \
-          --set CONFIGURE_OPTS "-with-openssl=${pkgs.openssl.dev}" \
-          --set PYENV_VIRTUALENV_DISABLE_PROMPT "1"
-      '';
-    })
-  ];
-
-  xresources.properties."Xft.dpi" = 110;
-
   home.username = "caandt";
 }

user/config/nvim/default.nix

@@ -21,8 +21,6 @@
       catppuccin-nvim
       tokyonight-nvim
       gitsigns-nvim
-      neo-tree-nvim
-      undotree
     ];
     extraPackages = with pkgs; [
       python3Packages.jedi-language-server

user/config/nvim/lua/init.lua

@@ -1,3 +1,4 @@
-require('u.options')
 require('u.bindings')
-require('u.plugins')
+require('u.options')
+require('u.lsp')
+require('u.cmp')

user/config/nvim/lua/u/bindings.lua

@@ -1,3 +1,4 @@
-vim.keymap.set('n', '<esc>', '<cmd>nohlsearch<cr>')
+vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
-vim.keymap.set('n', '<leader>t', '<cmd>Neotree toggle<cr>')
+
-vim.keymap.set('n', '<leader>u', '<cmd>UndotreeToggle<cr>')
+require('mini.move').setup()
+require('mini.ai').setup()

user/config/nvim/lua/u/options.lua

@@ -50,7 +50,23 @@ vim.api.nvim_create_autocmd('TextYankPost', {
     vim.highlight.on_yank()
   end,
 })
+
+local statusline = require('mini.statusline')
+statusline.setup()
+statusline.section_location = function()
+  return '%2l:%-2v'
+end
 vim.cmd.colorscheme 'tokyonight-storm'
 
-vim.g.loaded_netrwPlugin = 1
+require('gitsigns').setup({
-vim.g.loaded_netrw = 1
+  signs = {
+    add = { text = '+' },
+    change = { text = '*' },
+  },
+})
+
+require('nvim-treesitter.configs').setup({
+  highlight = {
+    enable = true
+  }
+})

user/config/nvim/lua/u/plugins/init.lua

@@ -1,29 +0,0 @@
-require('u.plugins.lsp')
-require('u.plugins.cmp')
-
-local statusline = require('mini.statusline')
-statusline.setup()
-statusline.section_location = function()
-  return '%2l:%-2v'
-end
-
-require('gitsigns').setup({
-  signs = {
-    add = { text = '+' },
-    change = { text = '*' },
-  },
-})
-
-require('nvim-treesitter.configs').setup({
-  highlight = {
-    enable = true
-  }
-})
-require('neo-tree').setup({
-  close_if_last_window = true,
-})
-
-require('mini.move').setup()
-require('mini.ai').setup()
-require('mini.jump2d').setup()
-require('mini.comment').setup()