diff options
Diffstat (limited to 'users')
| -rw-r--r-- | users/timmy/home.nix | 15 | ||||
| -rw-r--r-- | users/timmy/hosts.nix | 4 | ||||
| -rw-r--r-- | users/timmy/nas.nix | 7 | ||||
| -rw-r--r-- | users/timmy/printing.nix | 4 |
4 files changed, 12 insertions, 18 deletions
diff --git a/users/timmy/home.nix b/users/timmy/home.nix index 77934bc..8464296 100644 --- a/users/timmy/home.nix +++ b/users/timmy/home.nix @@ -9,12 +9,12 @@ download = "${home}/dls"; documents = "${home}/docs"; pictures = "${home}/pics"; + projects = "${home}/docs/src"; # Set these as null so they're not created music = null; publicShare = null; templates = null; videos = null; - #projects = "${home}/docs/src" }; in { options._users.${username}.home = { @@ -29,7 +29,7 @@ in { home = { username = username; homeDirectory = home; - stateVersion = "24.05"; + stateVersion = "26.05"; }; # Setup userdirs @@ -68,12 +68,12 @@ in { # Setup neovim programs._neovim = { enable = true; - package = pkgs.unstable.neovim; viAlias = true; vimAlias = true; plugins = { lsp = { enable = lib.mkDefault true; + lspconfig.enable = true; languageServers.packages = with pkgs; [ python313Packages.python-lsp-server svelte-language-server @@ -82,12 +82,9 @@ in { vscode-langservers-extracted ]; }; - treesitter = let - allTSParserPackages = builtins.filter lib.isDerivation - (builtins.attrValues pkgs.vimPlugins.nvim-treesitter-parsers); - in { + treesitter = { enable = lib.mkDefault true; - parsers.packages = allTSParserPackages; + parsers.installAll = lib.mkDefault true; }; packages.start = with pkgs.vimPlugins; [ autoclose-nvim @@ -96,7 +93,7 @@ in { minitab-nvim nvim-colorizer-lua nvim-ts-autotag # depends on treesitter - pkgs.unstable.vimPlugins.rainbow-delimiters-nvim # depends on treesitter + rainbow-delimiters-nvim # depends on treesitter snacks-nvim ]; }; diff --git a/users/timmy/hosts.nix b/users/timmy/hosts.nix index 16d9619..970b9d8 100644 --- a/users/timmy/hosts.nix +++ b/users/timmy/hosts.nix @@ -1,8 +1,6 @@ { networking.hosts = { - "192.168.1.9" = [ "optiplex" ]; - "192.168.1.30" = [ "localgit" ]; - "192.168.1.11" = [ "truenas-home" ]; + "192.168.1.1" = [ "poweredge" ]; # TODO remove once poweredge serves this override correctly "192.168.77.11" = [ "truenas-office" ]; "192.168.77.8" = [ "publicgit" "tjkeller" ]; "192.168.77.3" = [ "devel" ]; diff --git a/users/timmy/nas.nix b/users/timmy/nas.nix index 8fa28c3..bacb0f0 100644 --- a/users/timmy/nas.nix +++ b/users/timmy/nas.nix @@ -21,10 +21,9 @@ in { config = lib.mkIf cfg.enable { fileSystems = lib.optionalAttrs cfg.home.enable { - "/media/Storage/Media" = mkNetworkFileSystem "truenas-home:/mnt/Storage/Media" cfg.home.automount; - "/media/Storage/Backups" = mkNetworkFileSystem "truenas-home:/mnt/Storage/Backups" cfg.home.automount; - "/media/Storage/Tapes" = mkNetworkFileSystem "truenas-home:/mnt/Storage/Backups/Tapes" cfg.home.automount; - "/media/Family Photos" = mkNetworkFileSystem "truenas-home:/mnt/Media/Photos" cfg.home.automount; + "/media/ingens/backups" = mkNetworkFileSystem "poweredge:/media/ingens/backups" cfg.home.automount; + "/media/ingens/tapes" = mkNetworkFileSystem "poweredge:/media/ingens/tapes" cfg.home.automount; + "/media/ingens/pictures" = mkNetworkFileSystem "poweredge:/media/ingens/pictures" cfg.home.automount; } // lib.optionalAttrs cfg.office.enable { "/media/chexx/chexx" = mkNetworkFileSystem "truenas-office:/mnt/Storage/chexx" cfg.office.automount; "/media/chexx/tkdocs" = mkNetworkFileSystem "truenas-office:/mnt/Storage/Users/Tim-Keller" cfg.office.automount; diff --git a/users/timmy/printing.nix b/users/timmy/printing.nix index d5cceab..9dbba29 100644 --- a/users/timmy/printing.nix +++ b/users/timmy/printing.nix @@ -3,7 +3,7 @@ # Printer drivers services.printing.drivers = [ pkgs.epson-escpr2 - pkgs.workcentre-7800-series + #pkgs.workcentre-7800-series ]; # Scanning programs @@ -14,7 +14,7 @@ # Printers networking.hosts = { "192.168.1.35" = [ "Epson_ET-8500" ]; - "192.168.77.40" = [ "Xerox_WorkCentre_7855" ]; + #"192.168.77.40" = [ "Xerox_WorkCentre_7855" ]; }; # Add printers to cups |