Merge pull request 'Include NixOS into configuration' (#2) from nixos-snapshot-09092024 into master

Reviewed-on: #2

README.md

@@ -1,3 +1,68 @@
 # Wyatt's Nix configuration
 
 Designed and developed by Wyatt J. Miller, 2024
+
+Licensed by the Mozilla Public License v2
+
+## What is this??
+
+This repository is my multi-machine Nix configuration, written in a Nix flake!
+
+## How do I get this?
+
+Make sure the following is installed:
+
+- `git` (most operating systems come with git already installed)
+- `nix` (if you are on macOS or a non-NixOS system)
+
+If you don't have `git` installed and are running macOS, run the following command:
+
+```bash
+sudo xcode-select --install
+```
+
+If you don't have `nix` installed and are running Linux, use the Determinate Nix Installer!
+
+```bash
+curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install
+```
+
+If you don't have `nix` installed and are running macOS, use the Determinate Nix Installer!
+
+```bash
+curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install
+```
+
+There's a separate installer Determinate Systems releases (and feel free to try it) but that's not on the install list here.
+
+Once you got everything required, it's clonin' time!
+
+```bash
+git clone https://scm.wyattjmiller.com/wymiller/nix-config-v2
+```
+
+Once that's done, head to the next section.
+
+## How do I run this?
+
+For NixOS systems:
+
+```bash
+sudo nixos-rebuild switch --flake .#<hostname>
+```
+
+For macOS systems:
+
+```bash
+nix run nix-darwin --extra-experimental-features nix-command --extra-experimental-features flakes -- switch --flake .#<hostname>
+```
+
+_or_
+
+```bash
+darwin-rebuild switch --flake .#<hostname>
+```
+
+where `<hostname>` is the particular configuration you would like to run.
+
+Non-NixOS Linux systems should be coming soon!

defaults/.neoconf.json

@@ -0,0 +1,20 @@
+{
+  "neodev": {
+    "library": {
+      "enabled": true,
+      "plugins": true
+    }
+  },
+  "neoconf": {
+    "plugins": {
+      "lua_ls": {
+        "enabled": true
+      }
+    }
+  },
+  "lspconfig": {
+    "lua_ls": {
+      "Lua.format.enable": false
+    }
+  }
+}

defaults/.stylua.toml

@@ -0,0 +1,7 @@
+column_width = 120
+line_endings = "Unix"
+indent_type = "Spaces"
+indent_width = 2
+quote_style = "AutoPreferDouble"
+call_parentheses = "None"
+collapse_simple_statement = "Always"

defaults/nvim/init.lua

@@ -0,0 +1,19 @@
+-- This file simply bootstraps the installation of Lazy.nvim and then calls other files for execution
+-- This file doesn't necessarily need to be touched, BE CAUTIOUS editing this file and proceed at your own risk.
+local lazypath = vim.env.LAZY or vim.fn.stdpath "data" .. "/lazy/lazy.nvim"
+if not (vim.env.LAZY or (vim.uv or vim.loop).fs_stat(lazypath)) then
+  -- 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(lazypath)
+
+-- validate that lazy is available
+if not pcall(require, "lazy") then
+  -- stylua: ignore
+  vim.api.nvim_echo({ { ("Unable to load lazy from: %s\n"):format(lazypath), "ErrorMsg" }, { "Press any key to exit...", "MoreMsg" } }, true, {})
+  vim.fn.getchar()
+  vim.cmd.quit()
+end
+
+require "lazy_setup"
+require "polish"

defaults/nvim/lazy-lock.json

@@ -0,0 +1,67 @@
+{
+  "AstroNvim": { "branch": "main", "commit": "bfa02306c91c53f9b5782103f530ff729d6fd5b3" },
+  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
+  "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
+  "aerial.nvim": { "branch": "master", "commit": "7e2615991cf110f6688112abcb45cf338248d1f6" },
+  "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
+  "astrocommunity": { "branch": "main", "commit": "18978b14446256e68eae39b3c7770d15dfc025bd" },
+  "astrocore": { "branch": "main", "commit": "e659ec1f23dd070fa9a68a78eab0675b7bf3e97d" },
+  "astrolsp": { "branch": "main", "commit": "10ca6399694baca87982eafb0871b386fa33cf80" },
+  "astrotheme": { "branch": "main", "commit": "41b7d8430a55fd771e41bd763af4c3fd1c2fc0b5" },
+  "astroui": { "branch": "main", "commit": "a96ee08273f8050025c9e5b40776b0f2808313fa" },
+  "better-escape.nvim": { "branch": "master", "commit": "f45b52f8f87792e8659526f23261ffe278a54be5" },
+  "catppuccin": { "branch": "main", "commit": "d97387aea8264f484bb5d5e74f2182a06c83e0d8" },
+  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "cmp-dap": { "branch": "master", "commit": "ea92773e84c0ad3288c3bc5e452ac91559669087" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
+  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+  "crates.nvim": { "branch": "main", "commit": "891063a2dc8471501b9742406a514be62a20c138" },
+  "csharpls-extended-lsp.nvim": { "branch": "master", "commit": "5a474b06743bb20a90191994457f5e62f444976b" },
+  "dressing.nvim": { "branch": "master", "commit": "71349f24c6e07b39f33600985843c289ca735308" },
+  "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
+  "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" },
+  "guess-indent.nvim": { "branch": "main", "commit": "6cd61f7a600bb756e558627cd2e740302c58e32d" },
+  "heirline.nvim": { "branch": "master", "commit": "0d797435e54645a5f98bad7ad6046aac1ef95c1e" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
+  "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
+  "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" },
+  "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" },
+  "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" },
+  "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" },
+  "mason-nvim-dap.nvim": { "branch": "main", "commit": "4ba55f9755ebe8297d92c419b90a946123292ae6" },
+  "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
+  "mini.bufremove": { "branch": "main", "commit": "e6044aa28e61d4dd9ec86194d6f81743eced0c1c" },
+  "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" },
+  "neoconf.nvim": { "branch": "main", "commit": "7ce69e831556861f3bd32a5678f0176618df8621" },
+  "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
+  "none-ls.nvim": { "branch": "main", "commit": "a0fe586525eac4247d40076cdb2f1c2f55912171" },
+  "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" },
+  "nvim-autopairs": { "branch": "master", "commit": "e38c5d837e755ce186ae51d2c48e1b387c4425c6" },
+  "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" },
+  "nvim-colorizer.lua": { "branch": "master", "commit": "194ec600488f7c7229668d0e80bd197f3a2b84ff" },
+  "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" },
+  "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" },
+  "nvim-lspconfig": { "branch": "master", "commit": "9c762dcd457d2ab99edb3f3433cea9865ded47ad" },
+  "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
+  "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
+  "nvim-treesitter": { "branch": "master", "commit": "63be47f203d3e9174fdac3872fb9766e5bcc5a11" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" },
+  "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" },
+  "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" },
+  "nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" },
+  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
+  "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" },
+  "resession.nvim": { "branch": "master", "commit": "cc819b0489938d03e4f3532a583354f0287c015b" },
+  "rustaceanvim": { "branch": "master", "commit": "047f9c9d8cd2861745eb9de6c1570ee0875aa795" },
+  "smart-splits.nvim": { "branch": "master", "commit": "66fda3a601a5b4c679656f15eb6ddd613c8d3216" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
+  "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
+  "todo-comments.nvim": { "branch": "main", "commit": "313b04e5b02d29ab9275c9295ff5e2b73921b0eb" },
+  "toggleterm.nvim": { "branch": "main", "commit": "48be57eaba817f038d61bbf64d2c597f578c0827" },
+  "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
+  "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" }
+}

defaults/nvim/lua/community.lua

@@ -0,0 +1,17 @@
+-- AstroCommunity: import any community modules here
+-- We import this file in `lazy_setup.lua` before the `plugins/` folder.
+-- This guarantees that the specs are processed before any user plugins.
+
+---@type LazySpec
+return {
+  "AstroNvim/astrocommunity",
+  { import = "astrocommunity.pack.lua" }, -- lua support
+  { import = "astrocommunity.pack.rust" }, -- rust support
+  { import = "astrocommunity.pack.markdown" }, -- markdown support
+  { import = "astrocommunity.pack.nix" }, -- nix support
+  -- { import = "astrocommunity.pack.go "}, -- golang support
+  { import = "astrocommunity.pack.fish" }, -- fish support
+  -- { import = "astrocommunity.pack.cs" }, -- csharp/dotnet support
+
+  -- import/override with your plugins folder
+}

defaults/nvim/lua/lazy_setup.lua

@@ -0,0 +1,32 @@
+require("lazy").setup({
+  {
+    "AstroNvim/AstroNvim",
+    version = "^4", -- Remove version tracking to elect for nighly AstroNvim
+    import = "astronvim.plugins",
+    opts = { -- AstroNvim options must be set here with the `import` key
+      mapleader = " ", -- This ensures the leader key must be configured before Lazy is set up
+      maplocalleader = ",", -- This ensures the localleader key must be configured before Lazy is set up
+      icons_enabled = true, -- Set to false to disable icons (if no Nerd Font is available)
+      pin_plugins = nil, -- Default will pin plugins when tracking `version` of AstroNvim, set to true/false to override
+      update_notifications = true, -- Enable/disable notification about running `:Lazy update` twice to update pinned plugins
+    },
+  },
+  { import = "community" },
+  { import = "plugins" },
+} --[[@as LazySpec]], {
+  -- Configure any other `lazy.nvim` configuration options here
+  install = { colorscheme = { "astrotheme", "habamax" } },
+  ui = { backdrop = 100 },
+  performance = {
+    rtp = {
+      -- disable some rtp plugins, add more to your liking
+      disabled_plugins = {
+        "gzip",
+        "netrwPlugin",
+        "tarPlugin",
+        "tohtml",
+        "zipPlugin",
+      },
+    },
+  },
+} --[[@as LazyConfig]])

defaults/nvim/lua/plugins/astrocore.lua

@@ -0,0 +1,72 @@
+if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
+
+-- AstroCore provides a central place to modify mappings, vim options, autocommands, and more!
+-- Configuration documentation can be found with `:h astrocore`
+-- 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/astrocore",
+  ---@type AstroCoreOpts
+  opts = {
+    -- Configure core features of AstroNvim
+    features = {
+      large_buf = { size = 1024 * 256, lines = 10000 }, -- set global limits for large files for disabling features like treesitter
+      autopairs = true, -- enable autopairs at start
+      cmp = true, -- enable completion at start
+      diagnostics_mode = 3, -- diagnostic mode on start (0 = off, 1 = no signs/virtual text, 2 = no virtual text, 3 = on)
+      highlighturl = true, -- highlight URLs at start
+      notifications = true, -- enable notifications at start
+    },
+    -- Diagnostics configuration (for vim.diagnostics.config({...})) when diagnostics are on
+    diagnostics = {
+      virtual_text = true,
+      underline = true,
+    },
+    -- vim options can be configured here
+    options = {
+      opt = { -- vim.opt.<key>
+        relativenumber = true, -- sets vim.opt.relativenumber
+        number = true, -- sets vim.opt.number
+        spell = false, -- sets vim.opt.spell
+        signcolumn = "yes", -- sets vim.opt.signcolumn to yes
+        wrap = false, -- sets vim.opt.wrap
+      },
+      g = { -- vim.g.<key>
+        -- configure global vim variables (vim.g)
+        -- NOTE: `mapleader` and `maplocalleader` must be set in the AstroNvim opts or before `lazy.setup`
+        -- This can be found in the `lua/lazy_setup.lua` file
+      },
+    },
+    -- Mappings can be configured through AstroCore as well.
+    -- NOTE: keycodes follow the casing in the vimdocs. For example, `<Leader>` must be capitalized
+    mappings = {
+      -- first key is the mode
+      n = {
+        -- second key is the lefthand side of the map
+
+        -- navigate buffer tabs
+        ["]b"] = { function() require("astrocore.buffer").nav(vim.v.count1) end, desc = "Next buffer" },
+        ["[b"] = { function() require("astrocore.buffer").nav(-vim.v.count1) end, desc = "Previous buffer" },
+
+        -- mappings seen under group name "Buffer"
+        ["<Leader>bd"] = {
+          function()
+            require("astroui.status.heirline").buffer_picker(
+              function(bufnr) require("astrocore.buffer").close(bufnr) end
+            )
+          end,
+          desc = "Close buffer from tabline",
+        },
+
+        -- tables with just a `desc` key will be registered with which-key if it's installed
+        -- this is useful for naming menus
+        -- ["<Leader>b"] = { desc = "Buffers" },
+
+        -- setting a mapping to false will disable it
+        -- ["<C-S>"] = false,
+      },
+    },
+  },
+}

defaults/nvim/lua/plugins/astrolsp.lua

@@ -0,0 +1,114 @@
+if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
+
+-- 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 = {
+      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",
+        },
+        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 = {
+      -- "pyright"
+    },
+    -- customize language server configuration options passed to `lspconfig`
+    ---@diagnostic disable: missing-fields
+    config = {
+      -- clangd = { capabilities = { offsetEncoding = "utf-8" } },
+      rust_analyzer = {
+        settings = {
+          ['rust_analyzer'] = {
+          files = {
+            excludeDirs = ".direnv/",
+          },
+        },
+        },
+      },
+    },
+    -- 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_codelens_refresh = {
+        -- 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/codeLens",
+        -- cond = function(client, bufnr) return client.name == "lua_ls" end,
+        -- list of auto commands to set
+        {
+          -- events to trigger
+          event = { "InsertLeave", "BufEnter" },
+          -- the rest of the autocmd options (:h nvim_create_autocmd)
+          desc = "Refresh codelens (buffer)",
+          callback = function(args)
+            if require("astrolsp").config.features.codelens then vim.lsp.codelens.refresh { bufnr = args.buf } end
+          end,
+        },
+      },
+    },
+    -- mappings to be set up on attaching of a language server
+    mappings = {
+      n = {
+        -- 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.supports_method "textDocument/semanticTokens/full" and vim.lsp.semantic_tokens ~= nil
+          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,
+  },
+}

defaults/nvim/lua/plugins/astroui.lua

@@ -0,0 +1,37 @@
+-- AstroUI provides the basis for configuring the AstroNvim User Interface
+-- Configuration documentation can be found with `:h astroui`
+-- 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/astroui",
+  ---@type AstroUIOpts
+  opts = {
+    -- change colorscheme
+    colorscheme = "catppuccin",
+    -- AstroUI allows you to easily modify highlight groups easily for any and all colorschemes
+    highlights = {
+      init = { -- this table overrides highlights in all themes
+        -- Normal = { bg = "#000000" },
+      },
+      astrodark = { -- a table of overrides/changes when applying the astrotheme theme
+        -- Normal = { bg = "#000000" },
+      },
+    },
+    -- Icons can be configured throughout the interface
+    icons = {
+      -- configure the loading of the lsp in the status line
+      LSPLoading1 = "⠋",
+      LSPLoading2 = "⠙",
+      LSPLoading3 = "⠹",
+      LSPLoading4 = "⠸",
+      LSPLoading5 = "⠼",
+      LSPLoading6 = "⠴",
+      LSPLoading7 = "⠦",
+      LSPLoading8 = "⠧",
+      LSPLoading9 = "⠇",
+      LSPLoading10 = "⠏",
+    },
+  },
+}

defaults/nvim/lua/plugins/catppuccin.lua

@@ -0,0 +1,18 @@
+return {
+  {
+    "catppuccin/nvim",
+    name = "catppuccin",
+    opts = {
+      dim_inactive = { enabled = true, percentage = 0.25 },
+      highlight_overrides = {
+        mocha = function(c)
+          return {
+            Normal = { bg = c.mantle },
+            Comment = { fg = "#7687a0" },
+            ["@tag.attribute"] = { style = {} },
+          }
+        end,
+      },
+    },
+  },
+}

defaults/nvim/lua/plugins/mason.lua

@@ -0,0 +1,39 @@
+if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
+
+-- Customize Mason plugins
+
+---@type LazySpec
+return {
+  -- use mason-lspconfig to configure LSP installations
+  {
+    "williamboman/mason-lspconfig.nvim",
+    -- overrides `require("mason-lspconfig").setup(...)`
+    opts = {
+      ensure_installed = {
+        "lua_ls",
+        -- add more arguments for adding more language servers
+      },
+    },
+  },
+  -- use mason-null-ls to configure Formatters/Linter installation for null-ls sources
+  {
+    "jay-babu/mason-null-ls.nvim",
+    -- overrides `require("mason-null-ls").setup(...)`
+    opts = {
+      ensure_installed = {
+        "stylua",
+        -- add more arguments for adding more null-ls sources
+      },
+    },
+  },
+  {
+    "jay-babu/mason-nvim-dap.nvim",
+    -- overrides `require("mason-nvim-dap").setup(...)`
+    opts = {
+      ensure_installed = {
+        "python",
+        -- add more arguments for adding more debuggers
+      },
+    },
+  },
+}

defaults/nvim/lua/plugins/none-ls.lua

@@ -0,0 +1,24 @@
+if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
+
+-- Customize None-ls sources
+
+---@type LazySpec
+return {
+  "nvimtools/none-ls.nvim",
+  opts = function(_, opts)
+    -- opts variable is the default configuration table for the setup function call
+    -- local null_ls = require "null-ls"
+
+    -- Check supported formatters and linters
+    -- https://github.com/nvimtools/none-ls.nvim/tree/main/lua/null-ls/builtins/formatting
+    -- https://github.com/nvimtools/none-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics
+
+    -- Only insert new sources, do not replace the existing ones
+    -- (If you wish to replace, use `opts.sources = {}` instead of the `list_insert_unique` function)
+    opts.sources = require("astrocore").list_insert_unique(opts.sources, {
+      -- Set a formatter
+      -- null_ls.builtins.formatting.stylua,
+      -- null_ls.builtins.formatting.prettier,
+    })
+  end,
+}

defaults/nvim/lua/plugins/treesitter.lua

@@ -0,0 +1,15 @@
+if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
+
+-- Customize Treesitter
+
+---@type LazySpec
+return {
+  "nvim-treesitter/nvim-treesitter",
+  opts = {
+    ensure_installed = {
+      "lua",
+      "vim",
+      -- add more arguments for adding more treesitter parsers
+    },
+  },
+}

defaults/nvim/lua/plugins/user.lua

@@ -0,0 +1,85 @@
+if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
+
+-- You can also add or configure plugins by creating files in this `plugins/` folder
+-- Here are some examples:
+
+---@type LazySpec
+return {
+
+  -- == Examples of Adding Plugins ==
+
+  "andweeb/presence.nvim",
+  {
+    "ray-x/lsp_signature.nvim",
+    event = "BufRead",
+    config = function() require("lsp_signature").setup() end,
+  },
+
+  -- == Examples of Overriding Plugins ==
+
+  -- customize alpha options
+  {
+    "goolord/alpha-nvim",
+    opts = function(_, opts)
+      -- customize the dashboard header
+      opts.section.header.val = {
+        " █████  ███████ ████████ ██████   ██████",
+        "██   ██ ██         ██    ██   ██ ██    ██",
+        "███████ ███████    ██    ██████  ██    ██",
+        "██   ██      ██    ██    ██   ██ ██    ██",
+        "██   ██ ███████    ██    ██   ██  ██████",
+        " ",
+        "    ███    ██ ██    ██ ██ ███    ███",
+        "    ████   ██ ██    ██ ██ ████  ████",
+        "    ██ ██  ██ ██    ██ ██ ██ ████ ██",
+        "    ██  ██ ██  ██  ██  ██ ██  ██  ██",
+        "    ██   ████   ████   ██ ██      ██",
+      }
+      return opts
+    end,
+  },
+
+  -- You can disable default plugins as follows:
+  { "max397574/better-escape.nvim", enabled = false },
+
+  -- You can also easily customize additional setup of plugins that is outside of the plugin's setup call
+  {
+    "L3MON4D3/LuaSnip",
+    config = function(plugin, opts)
+      require "astronvim.plugins.configs.luasnip"(plugin, opts) -- include the default astronvim config that calls the setup call
+      -- add more custom luasnip configuration such as filetype extend or custom snippets
+      local luasnip = require "luasnip"
+      luasnip.filetype_extend("javascript", { "javascriptreact" })
+    end,
+  },
+
+  {
+    "windwp/nvim-autopairs",
+    config = function(plugin, opts)
+      require "astronvim.plugins.configs.nvim-autopairs"(plugin, opts) -- include the default astronvim config that calls the setup call
+      -- add more custom autopairs configuration such as custom rules
+      local npairs = require "nvim-autopairs"
+      local Rule = require "nvim-autopairs.rule"
+      local cond = require "nvim-autopairs.conds"
+      npairs.add_rules(
+        {
+          Rule("$", "$", { "tex", "latex" })
+            -- don't add a pair if the next character is %
+            :with_pair(cond.not_after_regex "%%")
+            -- don't add a pair if  the previous character is xxx
+            :with_pair(
+              cond.not_before_regex("xxx", 3)
+            )
+            -- don't move right when repeat character
+            :with_move(cond.none())
+            -- don't delete if the next character is xx
+            :with_del(cond.not_after_regex "xx")
+            -- disable adding a newline when you press <cr>
+            :with_cr(cond.none()),
+        },
+        -- disable for .vim files, but it work for another filetypes
+        Rule("a", "a", "-vim")
+      )
+    end,
+  },
+}

defaults/nvim/lua/polish.lua

@@ -0,0 +1,18 @@
+if true then return end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
+
+-- This will run last in the setup process and is a good place to configure
+-- things like custom filetypes. This just pure lua so anything that doesn't
+-- fit in the normal config locations above can go here
+
+-- Set up custom filetypes
+vim.filetype.add {
+  extension = {
+    foo = "fooscript",
+  },
+  filename = {
+    ["Foofile"] = "fooscript",
+  },
+  pattern = {
+    ["~/%.config/foo/.*"] = "fooscript",
+  },
+}

defaults/nvim/neovim.yml

@@ -0,0 +1,6 @@
+---
+base: lua51
+
+globals:
+  vim:
+    any: true

defaults/nvim/selene.toml

@@ -0,0 +1,8 @@
+std = "neovim"
+
+[rules]
+global_usage = "allow"
+if_same_then_else = "allow"
+incorrect_standard_library_use = "allow"
+mixed_table = "allow"
+multiple_statements = "allow"

flake.lock

@@ -3,19 +3,20 @@
     "darwin": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs-darwin"
+          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1722082646,
+        "lastModified": 1730448474,
-        "narHash": "sha256-od8dBWVP/ngg0cuoyEl/w9D+TCNDj6Kh4tr151Aax7w=",
+        "narHash": "sha256-qE/cYKBhzxHMtKtLK3hlSR3uzO1pWPGLrBuQK7r0CHc=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "0413754b3cdb879ba14f6e96915e5fdf06c6aab6",
+        "rev": "683d0c4cd1102dcccfa3f835565378c7f3cbe05e",
         "type": "github"
       },
       "original": {
         "owner": "lnl7",
+        "ref": "master",
         "repo": "nix-darwin",
         "type": "github"
       }
@@ -27,16 +28,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1720042825,
+        "lastModified": 1730490306,
-        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
+        "narHash": "sha256-AvCVDswOUM9D368HxYD25RsSKp+5o0L0/JHADjLoD38=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
+        "rev": "1743615b61c7285976f85b303a36cdf88a556503",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -57,34 +57,52 @@
         "type": "github"
       }
     },
-    "nixpkgs": {
+    "nix-ld": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
       "locked": {
-        "lastModified": 1725407940,
+        "lastModified": 1728031945,
-        "narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=",
+        "narHash": "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw=",
-        "owner": "nixos",
+        "owner": "Mic92",
-        "repo": "nixpkgs",
+        "repo": "nix-ld",
-        "rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3",
+        "rev": "4524c512e8729ccb5a1b9239d01e1474cbf074a2",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "Mic92",
-        "ref": "nixos-24.05",
+        "repo": "nix-ld",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1727634051,
+        "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs-darwin": {
+    "nixpkgs_2": {
       "locked": {
-        "lastModified": 1725498621,
+        "lastModified": 1726243404,
-        "narHash": "sha256-m12se55InZz03onhRji85deKJp4i0jrw980aDdxT0IM=",
+        "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0409a1b650bb50c225485f2ca21c325eb33f45c7",
+        "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixpkgs-24.05-darwin",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -94,8 +112,8 @@
         "darwin": "darwin",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs",
+        "nix-ld": "nix-ld",
-        "nixpkgs-darwin": "nixpkgs-darwin"
+        "nixpkgs": "nixpkgs_2"
       }
     }
   },

flake.nix

@@ -1,16 +1,16 @@
 {
   description = "Wyatt's nix configuration suite";
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
-    nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-24.05-darwin";
+    nix-ld.url = "github:Mic92/nix-ld";
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.05";
+      url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     darwin = {
-      url = "github:lnl7/nix-darwin";
+      url = "github:lnl7/nix-darwin/master";
-      inputs.nixpkgs.follows = "nixpkgs-darwin";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
@@ -18,6 +18,7 @@
     self,
     nixpkgs,
     nix-flatpak,
+    nix-ld,
     darwin,
     home-manager,
     ...
@@ -36,10 +37,10 @@
         hostname = "sephiroth";
       };
       modules = [
-        ./modules/nix-core.nix
+        ./modules/common/core.nix
-        ./modules/darwin/configuration.nix
+        ./modules/common/users.nix
-        ./modules/darwin/apps.nix
+        ./modules/machine/sephiroth/configuration.nix
-        ./modules/host-users.nix
+        ./modules/machine/sephiroth/apps.nix
 
         home-manager.darwinModules.home-manager
         {
@@ -52,17 +53,19 @@
     };
 
     # Primary desktop computer
-    nixosConfiguration."cloud" = nixpkgs.lib.nixosSystem {
+    nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = {
         inherit userName userEmail;
         hostname = "cloud";
       };
       modules = [
-        /etc/nixos/configuration.nix
+        nix-flatpak.nixosModules.nix-flatpak
-        ./modules/nix-core.nix
+        nix-ld.nixosModules.nix-ld
-        ./modules/nixos/configuration.nix
+        ./modules/common/core.nix
-        ./modules/host-users.nix
+        ./modules/common/users.nix
+        ./modules/machine/cloud/hardware-configuration.nix
+        ./modules/machine/cloud/configuration.nix
 
         home-manager.nixosModules.home-manager
         {
@@ -70,11 +73,61 @@
           home-manager.useUserPackages = true;
           home-manager.extraSpecialArgs = extraSpecialArgs;
           home-manager.users.${userName}.imports = [
-            nix-flatpak.homeManagerModules.nix-flatpak
             ./home
           ];
         }
       ];
     };
+
+    # Apartment appliance server
+    nixosConfigurations."valefor" = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      specialArgs = {
+        inherit userName userEmail;
+        hostname = "valefor";
+      };
+      # modules = [
+      #   nix-ld.nixosModules.nix-ld
+      #   ./modules/nix-core.nix
+      #   ./modules/host-users.nix
+      #
+      #   home-manager.nixosModules.home-manager
+      #   {
+      #     home-manager.useGlobalPkgs = true;
+      #     home-manager.useUserPackages = true;
+      #     home-manager.extraSpecialArgs = extraSpecialArgs;
+      #     home-manager.users.${userName}.imports = [
+      #       ./home
+      #     ];
+      #   }
+      # ];
+    };
+
+    # Storage, status, game, and media server
+    nixosConfigurations."ixion" = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      specialArgs = {
+        inherit userName userEmail;
+        hostname = "ixion";
+      };
+      # modules = [
+      #   nix-flatpak.nixosModules.nix-flatpak
+      #   nix-ld.nixosModules.nix-ld
+      #   ./modules/nixos/hardware-configuration.nix
+      #   ./modules/nix-core.nix
+      #   ./modules/nixos/configuration.nix
+      #   ./modules/host-users.nix
+      #
+      #   home-manager.nixosModules.home-manager
+      #   {
+      #     home-manager.useGlobalPkgs = true;
+      #     home-manager.useUserPackages = true;
+      #     home-manager.extraSpecialArgs = extraSpecialArgs;
+      #     home-manager.users.${userName}.imports = [
+      #       ./home
+      #     ];
+      #   }
+      # ];
+    };
   };
 }

home/default.nix

@@ -1,13 +1,21 @@
 {
+  lib,
   pkgs,
   userName,
+  userEmail,
   ...
-}: {
+}: let
+  # Have a file sturcture that holds all the configuration files that can't be configured by Nix
+  # or maybe I'm too lazy to do anything about it? I dunno
+  dirs = {
+    defaults = ../defaults;
+  };
+in {
   # Import sub modules
-  imports = [
+  imports = map (module: import module {inherit lib pkgs dirs userName userEmail;}) [
     ./atuin.nix
     ./shell.nix
-    ./core.nix
+    ./packages
     ./git.nix
     ./starship.nix
     ./eza.nix
@@ -25,9 +33,23 @@
       if pkgs.stdenv.isDarwin
       then "/Users/${userName}"
       else "/home/${userName}";
+
     sessionVariables = {
       XDG_CURRENT_DESKTOP = "sway";
+      XDG_SESSION_TYPE = "wayland";
+      XDG_CONFIG_HOME = "$HOME/.config";
+      XDG_CACHE_HOME = "$HOME/.cache";
+      XDG_DATA_HOME = "$HOME/.local/share";
+      XDG_STATE_HOME = "$HOME/.local/state";
     };
+
+    pointerCursor = lib.mkIf pkgs.stdenv.isLinux {
+      gtk.enable = true;
+      package = pkgs.catppuccin-cursors.mochaDark;
+      name = "catppuccin-mocha-dark-cursors";
+      size = 22;
+    };
+
     stateVersion = "24.05";
   };
 

home/flatpak.nix

@@ -1,12 +1,6 @@
 {...}: {
   services.flatpak = {
-    remotes = [
+    enable = true;
-      {
-        name = "flathub";
-        location = "https://dl.flathub.org/repo/flathub..flatpakrepo";
-      }
-    ];
-
     packages = [
       "com.github.tchx84.Flatseal"
       "com.slack.Slack"
@@ -18,5 +12,12 @@
       "org.prismlauncher.PrismLauncher"
       "sh.cider.Cider"
     ];
+
+    update = {
+      auto = {
+        enable = true;
+        onCalendar = "weekly";
+      };
+    };
   };
 }

home/git.nix

@@ -32,7 +32,8 @@
       # common aliases
       br = "branch";
       co = "checkout";
-      st = "status";
+      st = "status -sb";
+      status = "status -sb";
       ls = "log --pretty=format:\"%C(yellow)%h%Cred%d\\\\ %Creset%s%Cblue\\\\ [%cn]\" --decorate";
       ll = "log --pretty=format:\"%C(yellow)%h%Cred%d\\\\ %Creset%s%Cblue\\\\ [%cn]\" --decorate --numstat";
       cm = "commit -m";

home/neovim.nix

@@ -1,7 +1,14 @@
-{...}: {
+{dirs, ...}: {
   programs.neovim = {
     enable = true;
     defaultEditor = true;
     vimAlias = true;
   };
+
+  xdg.configFile = {
+    nvim = {
+      onChange = "nvim --headless -c 'if exists(\":LuaCacheClear\") | :LuaCacheClear' +quitall";
+      source = dirs.defaults + /nvim;
+    };
+  };
 }

home/packages/common.nix

@@ -21,6 +21,9 @@
     fh
     aria2
     yt-dlp
+    obsidian
+    vscode
+    weechat
 
     # misc
     cowsay
@@ -43,17 +46,5 @@
     deadnix
     alejandra
     statix
-
-    # productivity
-    iterm2
-    discord
-    obsidian
-    vscode
-    weechat
-    # iamb
-    ollama
-
-    # games?
-    # prismlauncher
   ];
 }

home/packages/darwin.nix

@@ -0,0 +1,10 @@
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  home.packages = lib.mkIf pkgs.stdenv.isDarwin (with pkgs; [
+    discord
+    ollama
+  ]);
+}

home/packages/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  imports = [
+    ./common.nix
+    ./darwin.nix
+    ./linux.nix
+  ];
+}

home/packages/linux.nix

@@ -0,0 +1,12 @@
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  home.packages = lib.mkIf pkgs.stdenv.isLinux (with pkgs; [
+    imv
+    betterdiscordctl
+    vesktop
+    xdg-utils
+  ]);
+}

home/shell.nix

@@ -69,4 +69,19 @@
       fi
     '';
   };
+
+
+  programs.bash = {
+    enable = true;
+    initExtra = ''
+      if [[ -z "$BASH_EXECUTION_STRING" ]]; then
+        if [[ -n "$ZSH_VERSION" ]]; then
+          LOGIN_OPTION="--login"
+        else
+          LOGIN_OPTION=""
+        fi
+        exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
+      fi
+    '';
+  };
 }

home/sway.nix

@@ -1,6 +1,10 @@
-{pkgs, ...}: let
+{
+  lib,
+  pkgs,
+  ...
+}: let
   dirs = {
-    defaults = ./defaults;
+    defaults = ../defaults;
   };
 in {
   wayland.windowManager.sway = {
@@ -14,87 +18,14 @@ in {
     };
   };
 
-  programs.wofi.enable = pkgs.stdenv.isLinux;
+  xdg.configFile."sway/config".source = lib.mkForce (dirs.defaults + /sway/config);
-  programs.mako.enable = pkgs.stdenv.isLinux;
+  xdg.configFile."waybar/config".source = lib.mkForce (dirs.defaults + /waybar/config);
+  xdg.configFile."waybar/style.css".source = lib.mkForce (dirs.defaults + /waybar/style.css);
+  programs.rofi.enable = pkgs.stdenv.isLinux;
+  services.mako.enable = pkgs.stdenv.isLinux;
   # programs.cliphist.enable = pkgs.stdenv.isLinux;
   programs.waybar = {
     enable = pkgs.stdenv.isLinux;
     systemd.enable = true;
-    style = ''
-        * {
-          border: none;
-          border-radius: 0;
-          font-family: "Monaspace Krypton";
-          font-size: 13px;
-          min-height: 0;
-        }
-
-        window#waybar {
-          background: #1f2335;
-          border-bottom: 1px solid #24283b;
-          color: #c0caf5;
-          opacity: 0.808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808;
-        }
-
-        #workspaces button {
-          padding: 5px;
-          padding-left: 12px;
-          padding-right: 12px;
-          background: transparent;
-          color: #c0caf5;
-          border-bottom: 1px solid transparent;
-        }
-
-        #workspaces button.focused {
-          background: #c0caf5;
-          color: #1d2021;
-          border-bottom: 1px solid #c0caf5;
-        }
-
-        #cpu,
-        #memory,
-        #pulseaudio,
-        #network,
-        #battery,
-        #clock,
-        #custom-playerctl {
-          padding: 0 10px;
-          margin: 0 5px;
-      }
-
-        #battery.charging {
-          color: #9ece6a;
-        }
-
-        #battery.warning:not(.charging) {
-          color: #ff9e64;
-        }
-
-        @keyframes blink {
-          to {
-            background-color: #1d2021;
-            color: #ebdbb2;
-          }
-        }
-
-        #battery.critical:not(.charging) {
-          background: #f7768e;
-          color: #ebdbb2;
-          border-bottom: 1px solid #ebdbb2;
-          animation-name: blink;
-          animation-duration: 0.5s;
-          animation-timing-function: linear;
-          animation-iteration-count: infinite;
-          animation-direction: alternate;
-        }
-
-        #network.disconnected {
-          color: #cc241d;
-        }
-
-        #pulseaudio.muted {
-          color: #cc241d;
-        }
-    '';
   };
 }

modules/common/README.md

@@ -0,0 +1,9 @@
+# Shared configurations
+
+Developed and designed by Wyatt J. Miller, 2024
+
+Licensed by the Mozilla Public License v2
+
+## Synopsis
+
+This is the directory that holds shared configuration files amongst computers that I own. They are called by the root `flake.nix` file.

modules/common/core.nix

@@ -1,19 +1,14 @@
-
-{ pkgs, lib, ... }:
-
 {
+  pkgs,
+  lib,
+  ...
+}: {
   # enable flakes globally
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nix.settings.experimental-features = ["nix-command" "flakes"];
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
-  # Auto upgrade nix package and the daemon service.
-  services.nix-daemon.enable = true;
-  # Use this instead of services.nix-daemon.enable if you
-  # don't wan't the daemon service to be managed for you.
-  # nix.useDaemon = true;
-
   nix.package = pkgs.nix;
 
   # do garbage collection weekly to keep disk usage low

modules/common/users.nix

@@ -1,4 +1,5 @@
 {
+  lib,
   pkgs,
   userName,
   hostname,
@@ -6,22 +7,31 @@
 } @ args: {
   # Set up networking configuration
   networking.hostName = hostname;
-  networking.computerName = hostname;
+  # networking.computerName = hostname;
   # networking.firewall.enable = true; # VERY important, do not touch
   # networking.firewall.allowedTCPPorts = [];
   # networking.firewall.allowedUDPPorts = [];
   # networking.networkmanager.enable = pkgs.stdenv.isLinux; # Linux tool for managing network connections
-  system.defaults.smb.NetBIOSName = hostname;
+  # system.defaults.smb.NetBIOSName = hostname;
 
   # Set up user accounts
   # Don't forget to set a password with ‘passwd’!
-  users.users."${userName}" = {
+  users.users."${userName}" = lib.mkMerge [
-    home =
+    {
-      if pkgs.stdenv.isDarwin
+      home =
-      then "/Users/${userName}"
+        if pkgs.stdenv.isDarwin
-      else "/home/${userName}";
+        then "/Users/${userName}"
-    description = userName;
+        else "/home/${userName}";
-  };
+      description = userName;
+    }
+
+    (lib.mkIf (pkgs.stdenv.isLinux) {
+      group = "${userName}";
+      isNormalUser = true;
+    })
+  ];
+
+  users.groups.wyatt = {};
 
   nix.settings.trusted-users = [userName];
 }

modules/machine/README.md

@@ -0,0 +1,15 @@
+# Machine specific configuration directories
+
+These are where the machine specific configurations live.
+
+I like Final Fantasy, alright? Isn't everyone supposed to have a hobby?
+
+## Naming schemes
+
+### Desktops, Laptops, and Workstations
+
+These are named after Final Fantasy VII characters.
+
+### Servers/Network Infrastructure
+
+These are named after Final Fantasy summons.

modules/machine/cloud/README.md

@@ -0,0 +1,9 @@
+# Machine specific configuration - cloud
+
+Designed and developed by Wyatt J. Miller, 2024
+
+Licensed by the Mozilla Public License v2
+
+## Synopsis
+
+This directory is where the machine-specific configuration files for hostname `cloud` live, my primary desktop. These files get called by the root `flake.nix` file.

modules/machine/cloud/configuration.nix

@@ -1,16 +1,8 @@
 {
-  inputs,
-  config,
-  lib,
   pkgs,
   userName,
   ...
 }: {
-  # Bring in the hardware configuration
-  imports = [
-    /etc/nixos/hardware-configuration.nix
-  ];
-
   # Enable flakes for NixOS
   nix.settings.experimental-features = ["nix-command" "flakes"];
 
@@ -20,9 +12,9 @@
 
   # Install and enable common graphics drivers
   hardware.opengl = {
-    driSupport = true;
+    # driSupport = true;
     extraPackages = with pkgs; [
-      mesa_drivers
+      mesa
       libvdpau-va-gl
       libva
       libva-utils
@@ -34,17 +26,17 @@
 
   # For systems with AMD graphics, this enables Vulkan on 32-bit applications
   # For 64-bit application, however, Vulkan is enabled by default
-  hardware.graphics.driSupport32Bit = true;
+  # hardware.graphics.driSupport32Bit = true;
 
   # For systems with AMD graphics, enable AMDVLK
-  hardware.hardware = {
+  #hardware.graphics = {
-    extraPackages = with pkgs; [
+  #  extraPackages = with pkgs; [
-      amdvlk
+  #    amdvlk
-    ];
+  #  ];
-    extraPackages32 = with pkgs; [
+  #  extraPackages32 = with pkgs; [
-      driversi686Linux
+  #    driversi686Linux
-    ];
+  #  ];
-  };
+  #};
 
   # Enable Bluetooth if present
   hardware.bluetooth.enable = true;
@@ -68,14 +60,21 @@
     git
     wireguard-tools
     podman
+    buildah
+    podman-tui
+    podman-compose
+    podman-desktop
     toolbox
     grim
     slurp
     playerctl
     light
     brightnessctl
+    firefox
     wttrbar
     cliphist
+    xivlauncher
+    patchelf
   ];
 
   # Install system-wide fonts
@@ -120,16 +119,31 @@
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true;
-    localNetworkGameTransfers = true;
+    localNetworkGameTransfers.openFirewall = true;
   };
 
+  # Enable gamemode (gamemode, gamemoded, gamemoderun) when needed
+  programs.gamemode.enable = true;
+
+  # Enable gamescope (compositor) when needed
+  programs.gamescope.enable = true;
+
   # Add username to groups "wheel" and "video" - more may be added here later
-  users.users.${userName}.extraGroups = ["wheel" "video"];
+  users.users.${userName}.extraGroups = ["wheel" "video" "gamemode" "podman" "network"];
 
   # XDG stuff
   xdg = {
     portal = {
       enable = true;
+      wlr.enable = true;
+      config = {
+        common = {
+          default = [
+            "wlr"
+          ];
+        };
+      };
+      xdgOpenUsePortal = true;
       extraPortals = with pkgs; [
         xdg-desktop-portal-wlr
         xdg-desktop-portal-gtk
@@ -139,10 +153,55 @@
 
   # Firewall stuff not allowed in common user and network creation
   networking.firewall.enable = true; # VERY important, do not touch
-  # networking.firewall.allowedTCPPorts = [];
+  networking.firewall.allowedTCPPorts = [];
-  # networking.firewall.allowedUDPPorts = [];
+  networking.firewall.allowedUDPPorts = [];
   networking.networkmanager.enable = true; # Linux tool for managing network connections
 
   # Enable Flatpak (app containerization)
-  services.flatpak.enable = true;
+  # services.flatpak.enable = true;
+  services.flatpak = {
+    enable = true;
+    remotes = [
+      {
+        name = "flathub";
+        location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
+      }
+    ];
+    packages = [
+      "com.github.tchx84.Flatseal"
+      "com.slack.Slack"
+      "info.beyondallreason.bar"
+      "io.dbeaver.DBeaverCommunity"
+      "io.openrct2.OpenRCT2"
+      "md.obsidian.Obsidian"
+      "org.prismlauncher.PrismLauncher"
+      "sh.cider.Cider"
+    ];
+    update = {
+      auto = {
+        enable = true;
+        onCalendar = "weekly";
+      };
+    };
+  };
+
+  # Enable Podman (OCI containers)
+  virtualisation.podman = {
+    enable = true;
+    dockerSocket.enable = true;
+    defaultNetwork.settings.dns_enabled = true;
+  };
+
+  services.shairport-sync = {
+    enable = pkgs.stdenv.isLinux;
+    openFirewall = pkgs.stdenv.isLinux;
+    arguments = "-v -o pw";
+  };
+
+  # users.users."${userName}" = {
+  #   group = "${userName}";
+  #   isNormalUser = true;
+  # };
+
+  system.stateVersion = "24.05";
 }

modules/machine/cloud/hardware-configuration.nix

@@ -0,0 +1,45 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = ["kvm-amd"];
+  boot.extraModulePackages = [];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-label/COMPUTER";
+    fsType = "xfs";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-label/BOOT";
+    fsType = "vfat";
+    options = ["fmask=0022" "dmask=0022"];
+  };
+
+  swapDevices = [
+    {device = "/dev/disk/by-label/SWAP";}
+  ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp9s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp8s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

modules/machine/ixion/README.md

@@ -0,0 +1,9 @@
+# Machine specific configuration - ixion
+
+Designed and developed by Wyatt J. Miller, 2024
+
+Licensed by the Mozilla Public License v2
+
+## Synopsis
+
+This directory is currently empty so, currently, there's nothing to see! However, this is where the machine-specific configuration files for hostname `ixion` live, my storage, status, game, and media server. These files get called by the root `flake.nix` file.

modules/machine/sephiroth/README.md

@@ -0,0 +1,9 @@
+# Machine specific configuration - sephiroth
+
+Designed and developed by Wyatt J. Miller, 2024
+
+Licensed by the Mozilla Public License v2
+
+## Synopsis
+
+This directory is where the machine-specific configuration files for hostname `sephiroth` live, my primary laptop. These files get called by the root `flake.nix` file.

modules/machine/sephiroth/apps.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }: {
+{pkgs, ...}: {
-
   environment.systemPackages = with pkgs; [
     neovim
     git
@@ -19,7 +18,7 @@
     # Applications to install from Mac App Store using mas.
     # You need to install all these Apps manually first so that your apple account have records for them.
     # otherwise Apple Store will refuse to install them.
-    # For details, see https://github.com/mas-cli/mas 
+    # For details, see https://github.com/mas-cli/mas
     masApps = {
       Xcode = 497799835;
       "Reeder 5." = 1529448980;
@@ -35,6 +34,8 @@
     ];
 
     casks = [
+      "raycast"
+      "jordanbaird-ice"
     ];
   };
 }

modules/machine/sephiroth/configuration.nix

@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  hostname,
+  ...
+}: {
   system = {
     # activationScripts are executed every time you boot the system or run `nixos-rebuild` / `darwin-rebuild`.
     activationScripts.postUserActivation.text = ''
@@ -145,6 +149,13 @@
     # };
   };
 
+  networking.hostName = hostname;
+  networking.computerName = hostname;
+  # networking.firewall.enable = true; # VERY important, do not touch
+  # networking.firewall.allowedTCPPorts = [];
+  # networking.firewall.allowedUDPPorts = [];
+  system.defaults.smb.NetBIOSName = hostname;
+
   # Add ability to used TouchID for sudo authentication
   security.pam.enableSudoTouchIdAuth = true;
 
@@ -157,6 +168,14 @@
     pkgs.bash
   ];
 
+  # Auto upgrade nix package and the daemon service.
+  # services.nix-daemon.enable = true;
+  # Use this instead of services.nix-daemon.enable if you
+  # don't wan't the daemon service to be managed for you.
+  services.nix-daemon.enable = true;
+
+  system.stateVersion = 5;
+
   # Set your time zone.
   time.timeZone = "America/Detroit";
 }

modules/machine/valefor/README.md

@@ -0,0 +1,9 @@
+# Machine specific configuration - valefor
+
+Designed and developed by Wyatt J. Miller, 2024
+
+Licensed by the Mozilla Public License v2
+
+## Synopsis
+
+This directory is currently empty so, currently, there's nothing to see! However, this is where the machine-specific configuration files for hostname `valefor` live, my apartment appliance server. These files get called by the root `flake.nix` file.