fix(neovim): adjust lsp identation

fix(neovim): use upstream vtsls
fix(home-manager): remove broken orca-slicer
2024-11-30 13:38:31 -03:00 · 2024-11-30 13:38:20 -03:00 · 2024-11-30 13:37:21 -03:00 · 2024-11-30 13:36:52 -03:00 · 2024-11-30 13:36:28 -03:00 · 2024-11-30 13:35:53 -03:00
13 changed files with 236 additions and 797 deletions
--- a/flake.lock
+++ b/flake.lock
@ -20,11 +20,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730968822,
-        "narHash": "sha256-NocDjINsh6ismkhb0Xr6xPRksmhuB2WGf8ZmXMhxu7Y=",
+        "lastModified": 1731774881,
+        "narHash": "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "a49bc3583ff223f426cb3526fdaa4bcaa247ec14",
+        "rev": "b31a6a4da8199ae3489057db7d36069a70749a56",
        "type": "github"
      },
      "original": {
@ -40,11 +40,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1727075863,
-        "narHash": "sha256-kMICeoMIBWzWeATKPK2CjL8JQrDRzbKTMbaCTtSsELQ=",
+        "lastModified": 1731355357,
+        "narHash": "sha256-kTXsO+hskCfX36+Ez1fHu9SO54uUY2lofkrbMKE3Vrk=",
        "owner": "dnut",
        "repo": "clipboard-sync",
-        "rev": "a79e6ad41faafbeb0db974fc08b3a8e6207ac6d5",
+        "rev": "943e49e0a9a16b54bbab3704e99b6cf6ad4ea19f",
        "type": "github"
      },
      "original": {
@ -114,11 +114,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1731235328,
-        "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
+        "lastModified": 1732482255,
+        "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "60bb110917844d354f3c18e05450606a435d2d10",
+        "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
        "type": "github"
      },
      "original": {
@ -170,11 +170,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1731340175,
-        "narHash": "sha256-qhkP+XRa1AuKkVrxKDLdK4gby363vH6wEie5tb6rz2E=",
+        "lastModified": 1732737540,
+        "narHash": "sha256-ORogf5yeqxar+fMJek+rpUgfnCOYcoeomvczo/tYOcE=",
        "owner": "hyprwm",
        "repo": "Hyprland",
-        "rev": "f5fa84554ffe55e29a397014964238be89ffa54d",
+        "rev": "5329298b522e3cc1201894909443775b00aeb336",
        "type": "github"
      },
      "original": {
@ -249,11 +249,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1731163338,
-        "narHash": "sha256-Qflei0JBeqQ0c8jxA8e982xAxJvfMwfx4Aci2eJi84s=",
+        "lastModified": 1731702627,
+        "narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "60d3dece30f98e8ad85131829c8529950630d6bc",
+        "rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1",
        "type": "github"
      },
      "original": {
@ -289,11 +289,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1730785428,
-        "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
+        "lastModified": 1731676054,
+        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
+        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
        "type": "github"
      },
      "original": {
@ -321,11 +321,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1731139594,
-        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
+        "lastModified": 1732521221,
+        "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
+        "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
        "type": "github"
      },
      "original": {
@ -346,11 +346,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1730814269,
-        "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
+        "lastModified": 1731363552,
+        "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "d70155fdc00df4628446352fc58adc640cd705c2",
+        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
        "type": "github"
      },
      "original": {
@ -376,11 +376,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1731298576,
-        "narHash": "sha256-l2m0LcSohbU7FXhdlJC/jbxt9PEvFfIcdEXQdSzbvL4=",
+        "lastModified": 1732681011,
+        "narHash": "sha256-LZomF/Q9DR9WJsf4JoLxKmiRmGIng0c46olLAtQYYlc=",
        "owner": "Gerg-L",
        "repo": "spicetify-nix",
-        "rev": "c503d1e7521af93013b6253a5f4899ea62a3c5a3",
+        "rev": "5d4ec6aded85cfb4434b1b9258dfc21fe827d6d2",
        "type": "github"
      },
      "original": {
@ -432,11 +432,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730743262,
-        "narHash": "sha256-iTLqj3lU8kFehPm5tXpctzkD274t/k1nwSSq3qCWXeg=",
+        "lastModified": 1731703417,
+        "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "09b23cef06fe248e61cec8862c04b9bcb62f4b6d",
+        "rev": "8070f36deec723de71e7557441acb17e478204d3",
        "type": "github"
      },
      "original": {
--- a/modules/home-manager/packages.nix
+++ b/modules/home-manager/packages.nix
@ -40,7 +40,7 @@
    blender
    krita
    lmms
-    orca-slicer
+    # orca-slicer # Currently broken - see nixpkgs PR#358948
    shotcut
    vcv-rack

--- a/modules/home-manager/programs/gamemode.ini
+++ b/modules/home-manager/programs/gamemode.ini
@ -42,17 +42,17 @@ inhibit_screensaver=0
 ; It is also highly recommended you try these settings out first manually to find the sweet spots

 ; Setting this to the keyphrase "accept-responsibility" will allow gamemode to apply GPU optimisations such as overclocks
-apply_gpu_optimisations=accept-responsibility
+;apply_gpu_optimisations=accept-responsibility

 ; The DRM device number on the system (usually 0), ie. the number in /sys/class/drm/card0/
-gpu_device=1
+;gpu_device=1

 ; AMD specific settings
 ; Requires a relatively up to date AMDGPU kernel module
 ; See: https://dri.freedesktop.org/docs/drm/gpu/amdgpu.html#gpu-power-thermal-controls-and-monitoring
 ; It is also highly recommended you use lm-sensors (or other available tools) to verify card temperatures
 ; This corresponds to power_dpm_force_performance_level, "manual" is not supported for now
-amd_performance_level=auto
+;amd_performance_level=auto

 [supervisor]
 ; This section controls the new gamemode functions gamemode_request_start_for and gamemode_request_end_for
--- a/modules/home-manager/programs/neovim/default.nix
+++ b/modules/home-manager/programs/neovim/default.nix
@ -86,7 +86,7 @@ in
        ruff

        # TypeScript/JavaScript
-        (callPackage ../vtsls { })
+        vtsls
        deno
        vscode-js-debug

--- a/modules/home-manager/programs/neovim/lsp.nix
+++ b/modules/home-manager/programs/neovim/lsp.nix
@ -5,180 +5,181 @@ let
 in
 #lua
 ''
-      -- AstroLSP allows you to customize the features in AstroNvim's LSP configuration engine
-      -- Configuration documentation can be found with `:h astrolsp`
-      -- NOTE: We highly recommend setting up the Lua Language Server (`:LspInstall lua_ls`)
-      --       as this provides autocomplete and documentation while editing
+  -- AstroLSP allows you to customize the features in AstroNvim's LSP configuration engine
+  -- Configuration documentation can be found with `:h astrolsp`
+  -- NOTE: We highly recommend setting up the Lua Language Server (`:LspInstall lua_ls`)
+  --       as this provides autocomplete and documentation while editing

-      ---@type LazySpec
-      return {
-        "AstroNvim/astrolsp",
-        ---@type AstroLSPOpts
-        opts = {
-          -- Configuration table of features provided by AstroLSP
-          features = {
-            autoformat = true,      -- enable or disable auto formatting on start
-            codelens = true,        -- enable/disable codelens refresh on start
-            inlay_hints = false,    -- enable/disable inlay hints on start
-            semantic_tokens = true, -- enable/disable semantic token highlighting
-          },
-          -- customize lsp formatting options
-          formatting = {
-            -- control auto formatting on save
-            format_on_save = {
-              enabled = true,     -- enable or disable format on save globally
-              allow_filetypes = { -- enable format on save for specified filetypes only
-                -- "go",
-                "c",
-                "cpp",
-                "h",
-                "javascript",
-                "jsx",
-                "lua",
-                "nix",
-                "rust",
-                "svelte",
-                "tsx",
-                "typescript",
-              },
-              ignore_filetypes = { -- disable format on save for specified filetypes
-                -- "python",
-              },
-            },
-            disabled = { -- disable formatting capabilities for the listed language servers
-              -- disable lua_ls formatting capability if you want to use StyLua to format your lua code
-              -- "lua_ls",
-            },
-            timeout_ms = 1000, -- default format timeout
-            -- filter = function(client) -- fully override the default formatting function
-            --   return true
-            -- end
-          },
-          -- enable servers that you already have installed without mason
-          servers = {
-            "basedpyright",
-            "clangd",
-            "cmake",
-            "csharp_ls",
-            "cssls",
-            "denols",
-            "eslint",
-            "html",
-            "jsonls",
-            "lua_ls",
-            "marksman",
-            "nixd",
-            "rust_analyzer",
+  ---@type LazySpec
+  return {
+    "AstroNvim/astrolsp",
+    ---@type AstroLSPOpts
+    opts = {
+      -- Configuration table of features provided by AstroLSP
+      features = {
+        autoformat = true,      -- enable or disable auto formatting on start
+        codelens = true,        -- enable/disable codelens refresh on start
+        inlay_hints = false,    -- enable/disable inlay hints on start
+        semantic_tokens = true, -- enable/disable semantic token highlighting
+      },
+      -- customize lsp formatting options
+      formatting = {
+        -- control auto formatting on save
+        format_on_save = {
+          enabled = true,     -- enable or disable format on save globally
+          allow_filetypes = { -- enable format on save for specified filetypes only
+            -- "go",
+            "c",
+            "cpp",
+            "h",
+            "javascript",
+            "jsx",
+            "lua",
+            "nix",
+            "rust",
            "svelte",
-            "taplo",
-            "vtsls",
-            "volar",
-            "yamlls",
+            "tsx",
+            "typescript",
+            "vue",
          },
-          -- customize language server configuration options passed to `lspconfig`
-          ---@diagnostic disable: missing-fields
-          config = {
-            -- clangd = { capabilities = { offsetEncoding = "utf-8" } },
+          ignore_filetypes = { -- disable format on save for specified filetypes
+            -- "python",
+          },
+        },
+        disabled = { -- disable formatting capabilities for the listed language servers
+          -- disable lua_ls formatting capability if you want to use StyLua to format your lua code
+          -- "lua_ls",
+        },
+        timeout_ms = 1000, -- default format timeout
+        -- filter = function(client) -- fully override the default formatting function
+        --   return true
+        -- end
+      },
+      -- enable servers that you already have installed without mason
+      servers = {
+        "basedpyright",
+        "clangd",
+        "cmake",
+        "csharp_ls",
+        "cssls",
+        "denols",
+        "eslint",
+        "html",
+        "jsonls",
+        "lua_ls",
+        "marksman",
+        "nixd",
+        "rust_analyzer",
+        "svelte",
+        "taplo",
+        "vtsls",
+        "volar",
+        "yamlls",
+      },
+      -- customize language server configuration options passed to `lspconfig`
+      ---@diagnostic disable: missing-fields
+      config = {
+        -- clangd = { capabilities = { offsetEncoding = "utf-8" } },
+        nixd = {
+          settings = {
            nixd = {
-              settings = {
-                nixd = {
-                  options = {
-                    nixos = {
-                      expr = '(builtins.getFlake ("${location}")).nixosConfigurations.${hostname}.options',
-                    },
-                    home_manager = {
-                      expr =
-                        '(builtins.getFlake ("${location}")).homeConfigurations.${hostname}.options',
-                    },
-                  },
+              options = {
+                nixos = {
+                  expr = '(builtins.getFlake ("${location}")).nixosConfigurations.${hostname}.options',
+                },
+                home_manager = {
+                  expr =
+                    '(builtins.getFlake ("${location}")).homeConfigurations.${hostname}.options',
                },
              },
            },
-            vtsls = {
-    	        filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue" },
-    	        settings = {
-    	          vtsls = {
-    	            tsserver = {
-    	              globalPlugins = {
-    	                {
-  				              name = "@vue/typescript-plugin",
-  				              location = "${pkgs.vue-language-server}/lib/node_modules/@vue/language-server",
-  				              languages = { "vue" },
-  				              configNamespace = "typescript",
-  				              enableForWorkspaceTypeScriptVersions = true,
-    	                }
-    	              },
-    	            },
-    	          },
-    	        },
-            },
          },
-          -- customize how language servers are attached
-          handlers = {
-            -- a function without a key is simply the default handler, functions take two parameters, the server name and the configured options table for that server
-            -- function(server, opts) require("lspconfig")[server].setup(opts) end
-
-            -- the key is the server that is being setup with `lspconfig`
-            -- rust_analyzer = false, -- setting a handler to false will disable the set up of that language server
-            -- pyright = function(_, opts) require("lspconfig").pyright.setup(opts) end -- or a custom handler function can be passed
-          },
-          -- Configure buffer local auto commands to add when attaching a language server
-          autocmds = {
-            -- first key is the `augroup` to add the auto commands to (:h augroup)
-            lsp_document_highlight = {
-              -- Optional condition to create/delete auto command group
-              -- can either be a string of a client capability or a function of `fun(client, bufnr): boolean`
-              -- condition will be resolved for each client on each execution and if it ever fails for all clients,
-              -- the auto commands will be deleted for that buffer
-              cond = "textDocument/documentHighlight",
-              -- cond = function(client, bufnr) return client.name == "lua_ls" end,
-              -- list of auto commands to set
-              {
-                -- events to trigger
-                event = { "CursorHold", "CursorHoldI" },
-                -- the rest of the autocmd options (:h nvim_create_autocmd)
-                desc = "Document Highlighting",
-                callback = function()
-                  vim.lsp.buf.document_highlight()
-                end,
-              },
-              {
-                event = { "CursorMoved", "CursorMovedI", "BufLeave" },
-                desc = "Document Highlighting Clear",
-                callback = function()
-                  vim.lsp.buf.clear_references()
-                end,
-              },
-            },
-          },
-          -- mappings to be set up on attaching of a language server
-          mappings = {
-            n = {
-              gl = {
-                function()
-                  vim.diagnostic.open_float()
-                end,
-                desc = "Hover diagnostics",
-              },
-              -- a `cond` key can provided as the string of a server capability to be required to attach, or a function with `client` and `bufnr` parameters from the `on_attach` that returns a boolean
-              -- gD = {
-              --   function() vim.lsp.buf.declaration() end,
-              --   desc = "Declaration of current symbol",
-              --   cond = "textDocument/declaration",
-              -- },
-              -- ["<Leader>uY"] = {
-              --   function() require("astrolsp.toggles").buffer_semantic_tokens() end,
-              --   desc = "Toggle LSP semantic highlight (buffer)",
-              --   cond = function(client) return client.server_capabilities.semanticTokensProvider and vim.lsp.semantic_tokens end,
-              -- },
-            },
-          },
-          -- A custom `on_attach` function to be run after the default `on_attach` function
-          -- takes two parameters `client` and `bufnr`  (`:h lspconfig-setup`)
-          on_attach = function(client, bufnr)
-            -- this would disable semanticTokensProvider for all clients
-            -- client.server_capabilities.semanticTokensProvider = nil
-          end,
        },
-      }
+        vtsls = {
+          filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue" },
+          settings = {
+            vtsls = {
+              tsserver = {
+                globalPlugins = {
+                  {
+                    name = "@vue/typescript-plugin",
+                    location = "${pkgs.vue-language-server}/lib/node_modules/@vue/language-server",
+                    languages = { "vue" },
+                    configNamespace = "typescript",
+                    enableForWorkspaceTypeScriptVersions = true,
+                  }
+                },
+              },
+            },
+          },
+        },
+      },
+      -- customize how language servers are attached
+      handlers = {
+        -- a function without a key is simply the default handler, functions take two parameters, the server name and the configured options table for that server
+        -- function(server, opts) require("lspconfig")[server].setup(opts) end
+
+        -- the key is the server that is being setup with `lspconfig`
+        -- rust_analyzer = false, -- setting a handler to false will disable the set up of that language server
+        -- pyright = function(_, opts) require("lspconfig").pyright.setup(opts) end -- or a custom handler function can be passed
+      },
+      -- Configure buffer local auto commands to add when attaching a language server
+      autocmds = {
+        -- first key is the `augroup` to add the auto commands to (:h augroup)
+        lsp_document_highlight = {
+          -- Optional condition to create/delete auto command group
+          -- can either be a string of a client capability or a function of `fun(client, bufnr): boolean`
+          -- condition will be resolved for each client on each execution and if it ever fails for all clients,
+          -- the auto commands will be deleted for that buffer
+          cond = "textDocument/documentHighlight",
+          -- cond = function(client, bufnr) return client.name == "lua_ls" end,
+          -- list of auto commands to set
+          {
+            -- events to trigger
+            event = { "CursorHold", "CursorHoldI" },
+            -- the rest of the autocmd options (:h nvim_create_autocmd)
+            desc = "Document Highlighting",
+            callback = function()
+              vim.lsp.buf.document_highlight()
+            end,
+          },
+          {
+            event = { "CursorMoved", "CursorMovedI", "BufLeave" },
+            desc = "Document Highlighting Clear",
+            callback = function()
+              vim.lsp.buf.clear_references()
+            end,
+          },
+        },
+      },
+      -- mappings to be set up on attaching of a language server
+      mappings = {
+        n = {
+          gl = {
+            function()
+              vim.diagnostic.open_float()
+            end,
+            desc = "Hover diagnostics",
+          },
+          -- a `cond` key can provided as the string of a server capability to be required to attach, or a function with `client` and `bufnr` parameters from the `on_attach` that returns a boolean
+          -- gD = {
+          --   function() vim.lsp.buf.declaration() end,
+          --   desc = "Declaration of current symbol",
+          --   cond = "textDocument/declaration",
+          -- },
+          -- ["<Leader>uY"] = {
+          --   function() require("astrolsp.toggles").buffer_semantic_tokens() end,
+          --   desc = "Toggle LSP semantic highlight (buffer)",
+          --   cond = function(client) return client.server_capabilities.semanticTokensProvider and vim.lsp.semantic_tokens end,
+          -- },
+        },
+      },
+      -- A custom `on_attach` function to be run after the default `on_attach` function
+      -- takes two parameters `client` and `bufnr`  (`:h lspconfig-setup`)
+      on_attach = function(client, bufnr)
+        -- this would disable semanticTokensProvider for all clients
+        -- client.server_capabilities.semanticTokensProvider = nil
+      end,
+    },
+  }
 ''
--- a/modules/home-manager/programs/vtsls/default.nix
+++ b/modules/home-manager/programs/vtsls/default.nix
@ -1,40 +0,0 @@
-{
-  lib,
-  buildNpmPackage,
-  fetchFromGitHub,
-  importNpmLock,
-}:
-
-buildNpmPackage rec {
-  pname = "vtsls";
-  version = "0.2.3";
-
-  src = fetchFromGitHub {
-    owner = "yioneko";
-    repo = "vtsls";
-    rev = "server-v${version}";
-    hash = "sha256-rHiH42WpKR1nZjsW+Q4pit1aLbNIKxpYSy7sjPS0WGc=";
-    fetchSubmodules = true;
-  };
-
-  sourceRoot = "${src.name}/packages/server";
-
-  npmDeps = importNpmLock {
-    npmRoot = "${src}/packages/server";
-    packageLock = lib.importJSON ./package-lock.json;
-  };
-
-  npmDepsHash = "sha256-R70+8vwcZHlT9J5MMCw3rjUQmki4/IoRYHO45CC8TiI=";
-
-  npmConfigHook = importNpmLock.npmConfigHook;
-
-  dontNpmPrune = true;
-
-  meta = with lib; {
-    description = "LSP wrapper around TypeScript extension bundled with VSCode.";
-    homepage = "https://github.com/yioneko/vtsls";
-    license = licenses.mit;
-    maintainers = with maintainers; [ wizardlink ];
-    platforms = platforms.all;
-  };
-}
--- a/modules/home-manager/programs/vtsls/package-lock.json
+++ b/modules/home-manager/programs/vtsls/package-lock.json
@ -1,551 +0,0 @@
-{
-  "name": "@vtsls/language-server",
-  "version": "0.2.3",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@vtsls/language-server",
-      "version": "0.2.3",
-      "license": "MIT",
-      "dependencies": {
-        "@vtsls/language-service": "0.2.3",
-        "vscode-languageserver": "^9.0.1",
-        "vscode-uri": "^3.0.8"
-      },
-      "bin": {
-        "vtsls": "bin/vtsls.js"
-      },
-      "devDependencies": {
-        "esbuild": "^0.21.3"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@vscode/l10n": {
-      "version": "0.0.18",
-      "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.18.tgz",
-      "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ=="
-    },
-    "node_modules/@vtsls/language-service": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@vtsls/language-service/-/language-service-0.2.3.tgz",
-      "integrity": "sha512-VqjmaSGbW0LHiJNdhBrKnxKXFrpBUUDc/FxakrRh6z26d4kg55mRpm9IM1khR0tkl3MYtejn0lLNQYcfCVHgYg==",
-      "dependencies": {
-        "@vscode/l10n": "^0.0.18",
-        "@vtsls/vscode-fuzzy": "0.0.1",
-        "jsonc-parser": "^3.2.0",
-        "semver": "7.5.2",
-        "typescript": "5.4.5",
-        "vscode-languageserver-protocol": "^3.17.5",
-        "vscode-languageserver-textdocument": "^1.0.11",
-        "vscode-uri": "^3.0.8"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/@vtsls/vscode-fuzzy": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/@vtsls/vscode-fuzzy/-/vscode-fuzzy-0.0.1.tgz",
-      "integrity": "sha512-2KCtA+/OmPVttsdVggO0WQFXZwM0zbG7G8KRGExe4YeoaHB0fDWyfsNrWnutnFVRlpmu8quVTjTI15YK6KGCFw=="
-    },
-    "node_modules/esbuild": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
-      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.21.5",
-        "@esbuild/android-arm": "0.21.5",
-        "@esbuild/android-arm64": "0.21.5",
-        "@esbuild/android-x64": "0.21.5",
-        "@esbuild/darwin-arm64": "0.21.5",
-        "@esbuild/darwin-x64": "0.21.5",
-        "@esbuild/freebsd-arm64": "0.21.5",
-        "@esbuild/freebsd-x64": "0.21.5",
-        "@esbuild/linux-arm": "0.21.5",
-        "@esbuild/linux-arm64": "0.21.5",
-        "@esbuild/linux-ia32": "0.21.5",
-        "@esbuild/linux-loong64": "0.21.5",
-        "@esbuild/linux-mips64el": "0.21.5",
-        "@esbuild/linux-ppc64": "0.21.5",
-        "@esbuild/linux-riscv64": "0.21.5",
-        "@esbuild/linux-s390x": "0.21.5",
-        "@esbuild/linux-x64": "0.21.5",
-        "@esbuild/netbsd-x64": "0.21.5",
-        "@esbuild/openbsd-x64": "0.21.5",
-        "@esbuild/sunos-x64": "0.21.5",
-        "@esbuild/win32-arm64": "0.21.5",
-        "@esbuild/win32-ia32": "0.21.5",
-        "@esbuild/win32-x64": "0.21.5"
-      }
-    },
-    "node_modules/jsonc-parser": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
-      "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA=="
-    },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/semver": {
-      "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
-      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
-      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
-    "node_modules/vscode-jsonrpc": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz",
-      "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==",
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/vscode-languageserver": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-9.0.1.tgz",
-      "integrity": "sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==",
-      "dependencies": {
-        "vscode-languageserver-protocol": "3.17.5"
-      },
-      "bin": {
-        "installServerIntoExtension": "bin/installServerIntoExtension"
-      }
-    },
-    "node_modules/vscode-languageserver-protocol": {
-      "version": "3.17.5",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz",
-      "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==",
-      "dependencies": {
-        "vscode-jsonrpc": "8.2.0",
-        "vscode-languageserver-types": "3.17.5"
-      }
-    },
-    "node_modules/vscode-languageserver-textdocument": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz",
-      "integrity": "sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA=="
-    },
-    "node_modules/vscode-languageserver-types": {
-      "version": "3.17.5",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz",
-      "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg=="
-    },
-    "node_modules/vscode-uri": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
-      "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw=="
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    }
-  }
-}
--- a/modules/nixos/packages.nix
+++ b/modules/nixos/packages.nix
@ -26,6 +26,13 @@
  programs.gamemode = {
    enable = true;
    enableRenice = true;
+    settings = {
+      gpu = {
+        apply_gpu_optimisations = "accept-responsibility";
+        gpu_device = 1;
+        amd_performance_level = "auto";
+      };
+    };
  };

  # Enable KDEConnect
--- a/modules/nixos/services.nix
+++ b/modules/nixos/services.nix
@ -15,6 +15,9 @@
  # And enable GNOME keyring for registering keys.
  services.gnome.gnome-keyring.enable = true;

+  # Enable flatpak to all users.
+  services.flatpak.enable = true;
+
  services.postgresql = {
    identMap = lib.mkIf config.services.postgresql.enable ''
      # MAP_NAME        SYSTEM_USER     DB_USER
--- a/specific/desktop/home-manager.nix
+++ b/specific/desktop/home-manager.nix
@ -9,6 +9,7 @@
  imports = [
    ../../modules/home-manager
    ./services/openttd.nix
+    ./services/terraria.nix
  ];

  # Home Manager needs a bit of information about you and the paths it should
--- a/specific/desktop/nixos.nix
+++ b/specific/desktop/nixos.nix
@ -54,6 +54,7 @@
      6567 # Mindustry
      80 # HTTP
      3979 # OpenTTD
+      7777 # Terraria
    ];

    allowedUDPPorts = [
--- a/specific/desktop/services/openttd.nix
+++ b/specific/desktop/services/openttd.nix
@ -14,8 +14,8 @@
    Unit.Description = "OpenTTD Tmux server";

    Service = {
-      ExecStart = "${pkgs.tmux}/bin/tmux new -s OpenTTD -d '${pkgs.openttd}/bin/openttd -g /home/wizardlink/.local/share/openttd/save/hyfy.sav -D'";
-      ExecStop = "${pkgs.tmux}/bin/tmux kill-server";
+      ExecStart = "${pkgs.tmux}/bin/tmux -S /run/user/1000/tmux-1000/openttd new -s OpenTTD -d '${pkgs.openttd}/bin/openttd -g /home/wizardlink/.local/share/openttd/save/hyfy.sav -D'";
+      ExecStop = "${pkgs.tmux}/bin/tmux kill-session -t OpenTTD";
      Restart = "on-failure";
      Type = "forking";
    };
@ -30,7 +30,7 @@
    };

    Service = {
-      ExecStart = "${pkgs.tmux}/bin/tmux send-keys -t OpenTTD 'rcon_pw aaaa' Enter";
+      ExecStart = "${pkgs.tmux}/bin/tmux -S /run/user/1000/tmux-1000/openttd send-keys -t OpenTTD 'rcon_pw aaaa' Enter";
      Type = "oneshot";
    };
  };
@ -44,7 +44,7 @@
    };

    Service = {
-      ExecStart = "${pkgs.tmux}/bin/tmux send-keys -t OpenTTD 'save hyfy' Enter";
+      ExecStart = "${pkgs.tmux}/bin/tmux -S /run/user/1000/tmux-1000/openttd send-keys -t OpenTTD 'save hyfy' Enter";
      Type = "simple";
      Restart = "always";
      RestartSec = "1800s";
--- a/specific/desktop/services/terraria.nix
+++ b/specific/desktop/services/terraria.nix
@ -0,0 +1,17 @@
+{ pkgs, ... }:
+
+{
+  systemd.user.services.terraria = {
+    Install.WantedBy = [ "default.target" ];
+
+    Unit.Description = "Terraria TMUX Server";
+
+    Service = {
+      ExecStart = "${pkgs.tmux}/bin/tmux -S /run/user/1000/tmux-1000/terraria new -s Terraria -d /etc/profiles/per-user/wizardlink/bin/fhs -c 'dotnet ./tModLoader.dll -server -config serverconfig.txt'";
+      ExecStop = "${pkgs.tmux}/bin/tmux kill-session -t Terraria";
+      Restart = "on-failure";
+      Type = "forking";
+      WorkingDirectory = "/mnt/ssd/SteamLibrary/steamapps/common/tModLoader";
+    };
+  };
+}
Author	SHA1	Message	Date
Alexandre Cavalheiro	572dbcf844	fix(neovim): adjust lsp identation	2024-11-30 13:38:31 -03:00
Alexandre Cavalheiro	3c3c049bb5	fix(neovim): use upstream vtsls	2024-11-30 13:38:20 -03:00
Alexandre Cavalheiro	fd9e6af2e9	fix(home-manager): remove broken orca-slicer	2024-11-30 13:37:21 -03:00
Alexandre Cavalheiro	c770d8e038	fix(gamemode): properly configure gpu settings	2024-11-30 13:36:52 -03:00
Alexandre Cavalheiro	43f6b7b491	feat(nixos): add flatpak	2024-11-30 13:36:28 -03:00
Alexandre Cavalheiro	b61f566aa2	fix(home-manager): make the openttd service use a secure socket	2024-11-30 13:35:53 -03:00
Alexandre Cavalheiro	7442269541	feat(home-manager): add Terraria service	2024-11-30 13:35:20 -03:00
Alexandre Cavalheiro	7ffc647e17	chore: flake update	2024-11-30 13:34:38 -03:00
Alexandre Cavalheiro	0d45db8793	chore: flake update	2024-11-27 23:58:53 -03:00
Alexandre Cavalheiro	015836f085	chore: flake update	2024-11-19 17:31:40 -03:00