diff --git a/flake.lock b/flake.lock index 7de34c8..2614696 100644 --- a/flake.lock +++ b/flake.lock @@ -77,6 +77,21 @@ "type": "github" } }, + "flake-utils_3": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "golink": { "inputs": { "flake-utils": "flake-utils", @@ -204,6 +219,27 @@ "url": "https://git.sr.ht/~dpatterbee/i3utils" } }, + "nixgl": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1685908677, + "narHash": "sha256-E4zUPEUFyVWjVm45zICaHRpfGepfkE9Z2OECV9HXfA4=", + "owner": "guibou", + "repo": "nixGL", + "rev": "489d6b095ab9d289fe11af0219a9ff00fe87c7c5", + "type": "github" + }, + "original": { + "owner": "guibou", + "repo": "nixGL", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1683014792, @@ -242,6 +278,7 @@ "home-manager": "home-manager_2", "hyprland": "hyprland", "i3utils": "i3utils", + "nixgl": "nixgl", "nixpkgs": "nixpkgs_2" } }, diff --git a/flake.nix b/flake.nix index f1c43d5..9203980 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,9 @@ golink.url = "github:tailscale/golink"; golink.inputs.nixpkgs.follows = "nixpkgs"; + + nixgl.url = "github:/guibou/nixGL"; + nixgl.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { @@ -26,6 +29,7 @@ i3utils, hyprland, golink, + nixgl, ... }: let system = "x86_64-linux"; @@ -37,6 +41,7 @@ overlays = [ golink.overlay hyprland.overlays.default + nixgl.overlay ]; }) // { @@ -56,6 +61,17 @@ lib = nixpkgs.lib; + deckSystem = {hostname}: + home-manager.lib.homeManagerConfiguration { + inherit pkgs; + modules = [ + ./users/deck + ]; + extraSpecialArgs = { + inherit hostname; + }; + }; + hostSystem = { hostname, headless, @@ -117,5 +133,10 @@ headless = true; }; }; + homeConfigurations = { + "deck" = deckSystem { + hostname = "deck"; + }; + }; }; } diff --git a/users/configs/desktop/default.nix b/users/configs/desktop/default.nix new file mode 100644 index 0000000..51346f4 --- /dev/null +++ b/users/configs/desktop/default.nix @@ -0,0 +1,9 @@ +{config, ...}: { + imports = [ + # ./i3 + # ./i3status-rust + # ./polybar + ./hyprland + ./waybar + ]; +} diff --git a/users/daniel/configs/desktop/hyprland/default.nix b/users/configs/desktop/hyprland/default.nix similarity index 100% rename from users/daniel/configs/desktop/hyprland/default.nix rename to users/configs/desktop/hyprland/default.nix diff --git a/users/daniel/configs/desktop/hyprland/dingbox.conf b/users/configs/desktop/hyprland/dingbox.conf similarity index 100% rename from users/daniel/configs/desktop/hyprland/dingbox.conf rename to users/configs/desktop/hyprland/dingbox.conf diff --git a/users/daniel/configs/desktop/hyprland/macchiato.conf b/users/configs/desktop/hyprland/macchiato.conf similarity index 100% rename from users/daniel/configs/desktop/hyprland/macchiato.conf rename to users/configs/desktop/hyprland/macchiato.conf diff --git a/users/daniel/configs/desktop/hyprland/pingbox.conf b/users/configs/desktop/hyprland/pingbox.conf similarity index 100% rename from users/daniel/configs/desktop/hyprland/pingbox.conf rename to users/configs/desktop/hyprland/pingbox.conf diff --git a/users/daniel/configs/desktop/i3/default.nix b/users/configs/desktop/i3/default.nix similarity index 100% rename from users/daniel/configs/desktop/i3/default.nix rename to users/configs/desktop/i3/default.nix diff --git a/users/daniel/configs/desktop/i3/flower b/users/configs/desktop/i3/flower similarity index 100% rename from users/daniel/configs/desktop/i3/flower rename to users/configs/desktop/i3/flower diff --git a/users/daniel/configs/desktop/i3/godown b/users/configs/desktop/i3/godown similarity index 100% rename from users/daniel/configs/desktop/i3/godown rename to users/configs/desktop/i3/godown diff --git a/users/daniel/configs/desktop/i3/goup b/users/configs/desktop/i3/goup similarity index 100% rename from users/daniel/configs/desktop/i3/goup rename to users/configs/desktop/i3/goup diff --git a/users/daniel/configs/desktop/i3status-rust/default.nix b/users/configs/desktop/i3status-rust/default.nix similarity index 100% rename from users/daniel/configs/desktop/i3status-rust/default.nix rename to users/configs/desktop/i3status-rust/default.nix diff --git a/users/daniel/configs/desktop/rofi/colour.rasi b/users/configs/desktop/rofi/colour.rasi similarity index 100% rename from users/daniel/configs/desktop/rofi/colour.rasi rename to users/configs/desktop/rofi/colour.rasi diff --git a/users/daniel/configs/desktop/rofi/default.nix b/users/configs/desktop/rofi/default.nix similarity index 100% rename from users/daniel/configs/desktop/rofi/default.nix rename to users/configs/desktop/rofi/default.nix diff --git a/users/daniel/configs/desktop/waybar/config.json b/users/configs/desktop/waybar/config.json similarity index 100% rename from users/daniel/configs/desktop/waybar/config.json rename to users/configs/desktop/waybar/config.json diff --git a/users/daniel/configs/desktop/waybar/default.nix b/users/configs/desktop/waybar/default.nix similarity index 100% rename from users/daniel/configs/desktop/waybar/default.nix rename to users/configs/desktop/waybar/default.nix diff --git a/users/daniel/configs/desktop/waybar/macchiato.css b/users/configs/desktop/waybar/macchiato.css similarity index 100% rename from users/daniel/configs/desktop/waybar/macchiato.css rename to users/configs/desktop/waybar/macchiato.css diff --git a/users/daniel/configs/desktop/waybar/style.css b/users/configs/desktop/waybar/style.css similarity index 100% rename from users/daniel/configs/desktop/waybar/style.css rename to users/configs/desktop/waybar/style.css diff --git a/users/daniel/configs/system/alacritty/default.nix b/users/configs/system/alacritty/default.nix similarity index 100% rename from users/daniel/configs/system/alacritty/default.nix rename to users/configs/system/alacritty/default.nix diff --git a/users/daniel/configs/system/default.nix b/users/configs/system/default.nix similarity index 62% rename from users/daniel/configs/system/default.nix rename to users/configs/system/default.nix index d3ffe90..e5770dc 100644 --- a/users/daniel/configs/system/default.nix +++ b/users/configs/system/default.nix @@ -1,7 +1,5 @@ { imports = [ - ./alacritty - ./helix ./kitty ./nvim ]; diff --git a/users/daniel/configs/system/helix/config/config.toml b/users/configs/system/helix/config/config.toml similarity index 100% rename from users/daniel/configs/system/helix/config/config.toml rename to users/configs/system/helix/config/config.toml diff --git a/users/daniel/configs/system/helix/config/themes/dracula.toml b/users/configs/system/helix/config/themes/dracula.toml similarity index 100% rename from users/daniel/configs/system/helix/config/themes/dracula.toml rename to users/configs/system/helix/config/themes/dracula.toml diff --git a/users/daniel/configs/system/helix/default.nix b/users/configs/system/helix/default.nix similarity index 100% rename from users/daniel/configs/system/helix/default.nix rename to users/configs/system/helix/default.nix diff --git a/users/daniel/configs/system/kitty/catppuccin.conf b/users/configs/system/kitty/catppuccin.conf similarity index 100% rename from users/daniel/configs/system/kitty/catppuccin.conf rename to users/configs/system/kitty/catppuccin.conf diff --git a/users/daniel/configs/system/kitty/default.nix b/users/configs/system/kitty/default.nix similarity index 81% rename from users/daniel/configs/system/kitty/default.nix rename to users/configs/system/kitty/default.nix index 5fae7e4..1a9b411 100644 --- a/users/daniel/configs/system/kitty/default.nix +++ b/users/configs/system/kitty/default.nix @@ -1,4 +1,27 @@ -{pkgs, ...}: { +{ + pkgs, + lib, + hostname, + ... +}: let + wrap_gl = program: let + name = lib.strings.getName program.name; + in + pkgs.symlinkJoin { + name = name; + paths = [ + (pkgs.writeShellScriptBin name '' + ${pkgs.nixgl.nixGLIntel}/bin/nixGLIntel ${program}/bin/${name} + '') + program + ]; + }; + + package = + if hostname == "deck" + then (wrap_gl pkgs.kitty) + else pkgs.kitty; +in { home.file.".config/kitty/catppuccin.conf" = { source = ./catppuccin.conf; }; @@ -7,6 +30,7 @@ font = { name = "Iosevka Nerd Font"; }; + package = package; settings = { "include" = "catppuccin.conf"; "scrollback_lines" = 50000; diff --git a/users/daniel/configs/system/neovim/default.nix b/users/configs/system/neovim/default.nix similarity index 100% rename from users/daniel/configs/system/neovim/default.nix rename to users/configs/system/neovim/default.nix diff --git a/users/daniel/configs/system/nushell/config.nu b/users/configs/system/nushell/config.nu similarity index 100% rename from users/daniel/configs/system/nushell/config.nu rename to users/configs/system/nushell/config.nu diff --git a/users/daniel/configs/system/nushell/default.nix b/users/configs/system/nushell/default.nix similarity index 100% rename from users/daniel/configs/system/nushell/default.nix rename to users/configs/system/nushell/default.nix diff --git a/users/daniel/configs/system/nushell/env.nu b/users/configs/system/nushell/env.nu similarity index 100% rename from users/daniel/configs/system/nushell/env.nu rename to users/configs/system/nushell/env.nu diff --git a/users/daniel/configs/system/nvim/default.nix b/users/configs/system/nvim/default.nix similarity index 100% rename from users/daniel/configs/system/nvim/default.nix rename to users/configs/system/nvim/default.nix diff --git a/users/daniel/configs/system/nvim/nvim/.github/CODE_OF_CONDUCT.md b/users/configs/system/nvim/nvim/.github/CODE_OF_CONDUCT.md similarity index 100% rename from users/daniel/configs/system/nvim/nvim/.github/CODE_OF_CONDUCT.md rename to users/configs/system/nvim/nvim/.github/CODE_OF_CONDUCT.md diff --git a/users/daniel/configs/system/nvim/nvim/.github/CONTRIBUTING.md b/users/configs/system/nvim/nvim/.github/CONTRIBUTING.md similarity index 100% rename from users/daniel/configs/system/nvim/nvim/.github/CONTRIBUTING.md rename to users/configs/system/nvim/nvim/.github/CONTRIBUTING.md diff --git a/users/daniel/configs/system/nvim/nvim/.github/FUNDING.yml b/users/configs/system/nvim/nvim/.github/FUNDING.yml similarity index 100% rename from users/daniel/configs/system/nvim/nvim/.github/FUNDING.yml rename to users/configs/system/nvim/nvim/.github/FUNDING.yml diff --git a/users/daniel/configs/system/nvim/nvim/.github/ISSUE_TEMPLATE/bug_report.yaml b/users/configs/system/nvim/nvim/.github/ISSUE_TEMPLATE/bug_report.yaml similarity index 100% rename from users/daniel/configs/system/nvim/nvim/.github/ISSUE_TEMPLATE/bug_report.yaml rename to users/configs/system/nvim/nvim/.github/ISSUE_TEMPLATE/bug_report.yaml diff --git a/users/daniel/configs/system/nvim/nvim/.github/ISSUE_TEMPLATE/config.yml b/users/configs/system/nvim/nvim/.github/ISSUE_TEMPLATE/config.yml similarity index 100% rename from users/daniel/configs/system/nvim/nvim/.github/ISSUE_TEMPLATE/config.yml rename to users/configs/system/nvim/nvim/.github/ISSUE_TEMPLATE/config.yml diff --git a/users/daniel/configs/system/nvim/nvim/.github/ISSUE_TEMPLATE/feature_request.yaml b/users/configs/system/nvim/nvim/.github/ISSUE_TEMPLATE/feature_request.yaml similarity index 100% rename from users/daniel/configs/system/nvim/nvim/.github/ISSUE_TEMPLATE/feature_request.yaml rename to users/configs/system/nvim/nvim/.github/ISSUE_TEMPLATE/feature_request.yaml diff --git a/users/daniel/configs/system/nvim/nvim/.github/PULL_REQUEST_TEMPLATE/chore.md b/users/configs/system/nvim/nvim/.github/PULL_REQUEST_TEMPLATE/chore.md similarity index 100% rename from users/daniel/configs/system/nvim/nvim/.github/PULL_REQUEST_TEMPLATE/chore.md rename to users/configs/system/nvim/nvim/.github/PULL_REQUEST_TEMPLATE/chore.md diff --git a/users/daniel/configs/system/nvim/nvim/.github/PULL_REQUEST_TEMPLATE/feature.md b/users/configs/system/nvim/nvim/.github/PULL_REQUEST_TEMPLATE/feature.md similarity index 100% rename from users/daniel/configs/system/nvim/nvim/.github/PULL_REQUEST_TEMPLATE/feature.md rename to users/configs/system/nvim/nvim/.github/PULL_REQUEST_TEMPLATE/feature.md diff --git a/users/daniel/configs/system/nvim/nvim/.github/PULL_REQUEST_TEMPLATE/fix.md b/users/configs/system/nvim/nvim/.github/PULL_REQUEST_TEMPLATE/fix.md similarity index 100% rename from users/daniel/configs/system/nvim/nvim/.github/PULL_REQUEST_TEMPLATE/fix.md rename to users/configs/system/nvim/nvim/.github/PULL_REQUEST_TEMPLATE/fix.md diff --git a/users/daniel/configs/system/nvim/nvim/.github/README.md b/users/configs/system/nvim/nvim/.github/README.md similarity index 100% rename from users/daniel/configs/system/nvim/nvim/.github/README.md rename to users/configs/system/nvim/nvim/.github/README.md diff --git a/users/daniel/configs/system/nvim/nvim/.github/stale.yml b/users/configs/system/nvim/nvim/.github/stale.yml similarity index 100% rename from users/daniel/configs/system/nvim/nvim/.github/stale.yml rename to users/configs/system/nvim/nvim/.github/stale.yml diff --git a/users/daniel/configs/system/nvim/nvim/.github/workflows/conventional_commit.yml b/users/configs/system/nvim/nvim/.github/workflows/conventional_commit.yml similarity index 100% rename from users/daniel/configs/system/nvim/nvim/.github/workflows/conventional_commit.yml rename to users/configs/system/nvim/nvim/.github/workflows/conventional_commit.yml diff --git a/users/daniel/configs/system/nvim/nvim/.github/workflows/docs.yml b/users/configs/system/nvim/nvim/.github/workflows/docs.yml similarity index 100% rename from users/daniel/configs/system/nvim/nvim/.github/workflows/docs.yml rename to users/configs/system/nvim/nvim/.github/workflows/docs.yml diff --git a/users/daniel/configs/system/nvim/nvim/.github/workflows/luacheck.yml b/users/configs/system/nvim/nvim/.github/workflows/luacheck.yml similarity index 100% rename from users/daniel/configs/system/nvim/nvim/.github/workflows/luacheck.yml rename to users/configs/system/nvim/nvim/.github/workflows/luacheck.yml diff --git a/users/daniel/configs/system/nvim/nvim/.github/workflows/spell.yml b/users/configs/system/nvim/nvim/.github/workflows/spell.yml similarity index 100% rename from users/daniel/configs/system/nvim/nvim/.github/workflows/spell.yml rename to users/configs/system/nvim/nvim/.github/workflows/spell.yml diff --git a/users/daniel/configs/system/nvim/nvim/.github/workflows/style.yml b/users/configs/system/nvim/nvim/.github/workflows/style.yml similarity index 100% rename from users/daniel/configs/system/nvim/nvim/.github/workflows/style.yml rename to users/configs/system/nvim/nvim/.github/workflows/style.yml diff --git a/users/daniel/configs/system/nvim/nvim/.github/workflows/updater.yml b/users/configs/system/nvim/nvim/.github/workflows/updater.yml similarity index 100% rename from users/daniel/configs/system/nvim/nvim/.github/workflows/updater.yml rename to users/configs/system/nvim/nvim/.github/workflows/updater.yml diff --git a/users/daniel/configs/system/nvim/nvim/.gitignore b/users/configs/system/nvim/nvim/.gitignore similarity index 100% rename from users/daniel/configs/system/nvim/nvim/.gitignore rename to users/configs/system/nvim/nvim/.gitignore diff --git a/users/daniel/configs/system/nvim/nvim/.luacheckrc b/users/configs/system/nvim/nvim/.luacheckrc similarity index 100% rename from users/daniel/configs/system/nvim/nvim/.luacheckrc rename to users/configs/system/nvim/nvim/.luacheckrc diff --git a/users/daniel/configs/system/nvim/nvim/.stylua.toml b/users/configs/system/nvim/nvim/.stylua.toml similarity index 100% rename from users/daniel/configs/system/nvim/nvim/.stylua.toml rename to users/configs/system/nvim/nvim/.stylua.toml diff --git a/users/daniel/configs/system/nvim/nvim/.styluaignore b/users/configs/system/nvim/nvim/.styluaignore similarity index 100% rename from users/daniel/configs/system/nvim/nvim/.styluaignore rename to users/configs/system/nvim/nvim/.styluaignore diff --git a/users/daniel/configs/system/nvim/nvim/.typos.toml b/users/configs/system/nvim/nvim/.typos.toml similarity index 100% rename from users/daniel/configs/system/nvim/nvim/.typos.toml rename to users/configs/system/nvim/nvim/.typos.toml diff --git a/users/daniel/configs/system/nvim/nvim/LICENSE b/users/configs/system/nvim/nvim/LICENSE similarity index 100% rename from users/daniel/configs/system/nvim/nvim/LICENSE rename to users/configs/system/nvim/nvim/LICENSE diff --git a/users/daniel/configs/system/nvim/nvim/config.ld b/users/configs/system/nvim/nvim/config.ld similarity index 100% rename from users/daniel/configs/system/nvim/nvim/config.ld rename to users/configs/system/nvim/nvim/config.ld diff --git a/users/daniel/configs/system/nvim/nvim/init.lua b/users/configs/system/nvim/nvim/init.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/init.lua rename to users/configs/system/nvim/nvim/init.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/astronvim/autocmds.lua b/users/configs/system/nvim/nvim/lua/astronvim/autocmds.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/astronvim/autocmds.lua rename to users/configs/system/nvim/nvim/lua/astronvim/autocmds.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/astronvim/bootstrap.lua b/users/configs/system/nvim/nvim/lua/astronvim/bootstrap.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/astronvim/bootstrap.lua rename to users/configs/system/nvim/nvim/lua/astronvim/bootstrap.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/astronvim/health.lua b/users/configs/system/nvim/nvim/lua/astronvim/health.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/astronvim/health.lua rename to users/configs/system/nvim/nvim/lua/astronvim/health.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/astronvim/icons/nerd_font.lua b/users/configs/system/nvim/nvim/lua/astronvim/icons/nerd_font.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/astronvim/icons/nerd_font.lua rename to users/configs/system/nvim/nvim/lua/astronvim/icons/nerd_font.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/astronvim/icons/text.lua b/users/configs/system/nvim/nvim/lua/astronvim/icons/text.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/astronvim/icons/text.lua rename to users/configs/system/nvim/nvim/lua/astronvim/icons/text.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/astronvim/lazy.lua b/users/configs/system/nvim/nvim/lua/astronvim/lazy.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/astronvim/lazy.lua rename to users/configs/system/nvim/nvim/lua/astronvim/lazy.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/astronvim/mappings.lua b/users/configs/system/nvim/nvim/lua/astronvim/mappings.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/astronvim/mappings.lua rename to users/configs/system/nvim/nvim/lua/astronvim/mappings.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/astronvim/options.lua b/users/configs/system/nvim/nvim/lua/astronvim/options.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/astronvim/options.lua rename to users/configs/system/nvim/nvim/lua/astronvim/options.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/astronvim/utils/buffer.lua b/users/configs/system/nvim/nvim/lua/astronvim/utils/buffer.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/astronvim/utils/buffer.lua rename to users/configs/system/nvim/nvim/lua/astronvim/utils/buffer.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/astronvim/utils/ffi.lua b/users/configs/system/nvim/nvim/lua/astronvim/utils/ffi.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/astronvim/utils/ffi.lua rename to users/configs/system/nvim/nvim/lua/astronvim/utils/ffi.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/astronvim/utils/git.lua b/users/configs/system/nvim/nvim/lua/astronvim/utils/git.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/astronvim/utils/git.lua rename to users/configs/system/nvim/nvim/lua/astronvim/utils/git.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/astronvim/utils/init.lua b/users/configs/system/nvim/nvim/lua/astronvim/utils/init.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/astronvim/utils/init.lua rename to users/configs/system/nvim/nvim/lua/astronvim/utils/init.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/astronvim/utils/lsp.lua b/users/configs/system/nvim/nvim/lua/astronvim/utils/lsp.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/astronvim/utils/lsp.lua rename to users/configs/system/nvim/nvim/lua/astronvim/utils/lsp.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/astronvim/utils/mason.lua b/users/configs/system/nvim/nvim/lua/astronvim/utils/mason.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/astronvim/utils/mason.lua rename to users/configs/system/nvim/nvim/lua/astronvim/utils/mason.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/astronvim/utils/status.lua b/users/configs/system/nvim/nvim/lua/astronvim/utils/status.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/astronvim/utils/status.lua rename to users/configs/system/nvim/nvim/lua/astronvim/utils/status.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/astronvim/utils/ui.lua b/users/configs/system/nvim/nvim/lua/astronvim/utils/ui.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/astronvim/utils/ui.lua rename to users/configs/system/nvim/nvim/lua/astronvim/utils/ui.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/astronvim/utils/updater.lua b/users/configs/system/nvim/nvim/lua/astronvim/utils/updater.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/astronvim/utils/updater.lua rename to users/configs/system/nvim/nvim/lua/astronvim/utils/updater.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/lazy_snapshot.lua b/users/configs/system/nvim/nvim/lua/lazy_snapshot.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/lazy_snapshot.lua rename to users/configs/system/nvim/nvim/lua/lazy_snapshot.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/alpha.lua b/users/configs/system/nvim/nvim/lua/plugins/alpha.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/alpha.lua rename to users/configs/system/nvim/nvim/lua/plugins/alpha.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/cmp.lua b/users/configs/system/nvim/nvim/lua/plugins/cmp.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/cmp.lua rename to users/configs/system/nvim/nvim/lua/plugins/cmp.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/configs/alpha.lua b/users/configs/system/nvim/nvim/lua/plugins/configs/alpha.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/configs/alpha.lua rename to users/configs/system/nvim/nvim/lua/plugins/configs/alpha.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/configs/cmp-dap.lua b/users/configs/system/nvim/nvim/lua/plugins/configs/cmp-dap.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/configs/cmp-dap.lua rename to users/configs/system/nvim/nvim/lua/plugins/configs/cmp-dap.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/configs/guess-indent.lua b/users/configs/system/nvim/nvim/lua/plugins/configs/guess-indent.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/configs/guess-indent.lua rename to users/configs/system/nvim/nvim/lua/plugins/configs/guess-indent.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/configs/heirline.lua b/users/configs/system/nvim/nvim/lua/plugins/configs/heirline.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/configs/heirline.lua rename to users/configs/system/nvim/nvim/lua/plugins/configs/heirline.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/configs/lspconfig.lua b/users/configs/system/nvim/nvim/lua/plugins/configs/lspconfig.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/configs/lspconfig.lua rename to users/configs/system/nvim/nvim/lua/plugins/configs/lspconfig.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/configs/lspkind.lua b/users/configs/system/nvim/nvim/lua/plugins/configs/lspkind.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/configs/lspkind.lua rename to users/configs/system/nvim/nvim/lua/plugins/configs/lspkind.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/configs/luasnip.lua b/users/configs/system/nvim/nvim/lua/plugins/configs/luasnip.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/configs/luasnip.lua rename to users/configs/system/nvim/nvim/lua/plugins/configs/luasnip.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/configs/mason-lspconfig.lua b/users/configs/system/nvim/nvim/lua/plugins/configs/mason-lspconfig.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/configs/mason-lspconfig.lua rename to users/configs/system/nvim/nvim/lua/plugins/configs/mason-lspconfig.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/configs/mason-null-ls.lua b/users/configs/system/nvim/nvim/lua/plugins/configs/mason-null-ls.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/configs/mason-null-ls.lua rename to users/configs/system/nvim/nvim/lua/plugins/configs/mason-null-ls.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/configs/mason-nvim-dap.lua b/users/configs/system/nvim/nvim/lua/plugins/configs/mason-nvim-dap.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/configs/mason-nvim-dap.lua rename to users/configs/system/nvim/nvim/lua/plugins/configs/mason-nvim-dap.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/configs/mason.lua b/users/configs/system/nvim/nvim/lua/plugins/configs/mason.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/configs/mason.lua rename to users/configs/system/nvim/nvim/lua/plugins/configs/mason.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/configs/notify.lua b/users/configs/system/nvim/nvim/lua/plugins/configs/notify.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/configs/notify.lua rename to users/configs/system/nvim/nvim/lua/plugins/configs/notify.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/configs/nvim-autopairs.lua b/users/configs/system/nvim/nvim/lua/plugins/configs/nvim-autopairs.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/configs/nvim-autopairs.lua rename to users/configs/system/nvim/nvim/lua/plugins/configs/nvim-autopairs.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/configs/nvim-dap-ui.lua b/users/configs/system/nvim/nvim/lua/plugins/configs/nvim-dap-ui.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/configs/nvim-dap-ui.lua rename to users/configs/system/nvim/nvim/lua/plugins/configs/nvim-dap-ui.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/configs/nvim-treesitter.lua b/users/configs/system/nvim/nvim/lua/plugins/configs/nvim-treesitter.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/configs/nvim-treesitter.lua rename to users/configs/system/nvim/nvim/lua/plugins/configs/nvim-treesitter.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/configs/nvim-web-devicons.lua b/users/configs/system/nvim/nvim/lua/plugins/configs/nvim-web-devicons.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/configs/nvim-web-devicons.lua rename to users/configs/system/nvim/nvim/lua/plugins/configs/nvim-web-devicons.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/configs/telescope.lua b/users/configs/system/nvim/nvim/lua/plugins/configs/telescope.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/configs/telescope.lua rename to users/configs/system/nvim/nvim/lua/plugins/configs/telescope.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/configs/which-key.lua b/users/configs/system/nvim/nvim/lua/plugins/configs/which-key.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/configs/which-key.lua rename to users/configs/system/nvim/nvim/lua/plugins/configs/which-key.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/core.lua b/users/configs/system/nvim/nvim/lua/plugins/core.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/core.lua rename to users/configs/system/nvim/nvim/lua/plugins/core.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/dap.lua b/users/configs/system/nvim/nvim/lua/plugins/dap.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/dap.lua rename to users/configs/system/nvim/nvim/lua/plugins/dap.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/git.lua b/users/configs/system/nvim/nvim/lua/plugins/git.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/git.lua rename to users/configs/system/nvim/nvim/lua/plugins/git.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/heirline.lua b/users/configs/system/nvim/nvim/lua/plugins/heirline.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/heirline.lua rename to users/configs/system/nvim/nvim/lua/plugins/heirline.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/lsp.lua b/users/configs/system/nvim/nvim/lua/plugins/lsp.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/lsp.lua rename to users/configs/system/nvim/nvim/lua/plugins/lsp.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/mason.lua b/users/configs/system/nvim/nvim/lua/plugins/mason.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/mason.lua rename to users/configs/system/nvim/nvim/lua/plugins/mason.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/neo-tree.lua b/users/configs/system/nvim/nvim/lua/plugins/neo-tree.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/neo-tree.lua rename to users/configs/system/nvim/nvim/lua/plugins/neo-tree.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/telescope.lua b/users/configs/system/nvim/nvim/lua/plugins/telescope.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/telescope.lua rename to users/configs/system/nvim/nvim/lua/plugins/telescope.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/treesitter.lua b/users/configs/system/nvim/nvim/lua/plugins/treesitter.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/treesitter.lua rename to users/configs/system/nvim/nvim/lua/plugins/treesitter.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/plugins/ui.lua b/users/configs/system/nvim/nvim/lua/plugins/ui.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/plugins/ui.lua rename to users/configs/system/nvim/nvim/lua/plugins/ui.lua diff --git a/users/daniel/configs/system/nvim/nvim/lua/resession/extensions/astronvim.lua b/users/configs/system/nvim/nvim/lua/resession/extensions/astronvim.lua similarity index 100% rename from users/daniel/configs/system/nvim/nvim/lua/resession/extensions/astronvim.lua rename to users/configs/system/nvim/nvim/lua/resession/extensions/astronvim.lua diff --git a/users/daniel/configs/desktop/default.nix b/users/daniel/configs/desktop/default.nix deleted file mode 100644 index 23ab70c..0000000 --- a/users/daniel/configs/desktop/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{config, ...}: { - imports = [ - # ./i3 - # ./i3status-rust - # ./polybar - ./hyprland - ./waybar - ]; - - home.file = { - ".age/age.txt" = { - source = config.lib.file.mkOutOfStoreSymlink "/run/agenix/age_identity"; - }; - ".minisign/minisign.key" = { - source = config.lib.file.mkOutOfStoreSymlink "/run/agenix/minisign_private_key"; - }; - }; -} diff --git a/users/daniel/configs/system/nvim/nvim/lua/user/.github/README.md b/users/daniel/configs/system/nvim/nvim/lua/user/.github/README.md deleted file mode 100644 index e6c589a..0000000 --- a/users/daniel/configs/system/nvim/nvim/lua/user/.github/README.md +++ /dev/null @@ -1,36 +0,0 @@ -# AstroNvim User Configuration Example - -A user configuration template for [AstroNvim](https://github.com/AstroNvim/AstroNvim) - -## 🛠️ Installation - -#### Make a backup of your current nvim and shared folder - -```shell -mv ~/.config/nvim ~/.config/nvim.bak -mv ~/.local/share/nvim ~/.local/share/nvim.bak -``` - -#### Clone AstroNvim - -```shell -git clone https://github.com/AstroNvim/AstroNvim ~/.config/nvim -``` - -#### Create a new user repository from this template - -Press the "Use this template" button above to create a new repository to store your user configuration. - -You can also just clone this repository directly if you do not want to track your user configuration in GitHub. - -#### Clone the repository - -```shell -git clone https://github.com// ~/.config/nvim/lua/user -``` - -#### Start Neovim - -```shell -nvim -``` diff --git a/users/daniel/configs/system/nvim/nvim/lua/user/.stylua.toml b/users/daniel/configs/system/nvim/nvim/lua/user/.stylua.toml deleted file mode 100644 index bfcffff..0000000 --- a/users/daniel/configs/system/nvim/nvim/lua/user/.stylua.toml +++ /dev/null @@ -1,7 +0,0 @@ -column_width = 120 -line_endings = "Unix" -indent_type = "Spaces" -indent_width = 2 -quote_style = "AutoPreferDouble" -call_parentheses = "None" -collapse_simple_statement = "Always" diff --git a/users/daniel/configs/system/nvim/nvim/lua/user/highlights/duskfox.lua b/users/daniel/configs/system/nvim/nvim/lua/user/highlights/duskfox.lua deleted file mode 100644 index 31318ee..0000000 --- a/users/daniel/configs/system/nvim/nvim/lua/user/highlights/duskfox.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { -- a table of overrides/changes to the duskfox theme - Normal = { bg = "#000000" }, -} diff --git a/users/daniel/configs/system/nvim/nvim/lua/user/highlights/init.lua b/users/daniel/configs/system/nvim/nvim/lua/user/highlights/init.lua deleted file mode 100644 index f7e055b..0000000 --- a/users/daniel/configs/system/nvim/nvim/lua/user/highlights/init.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { -- this table overrides highlights in all themes - -- Normal = { bg = "#000000" }, -} diff --git a/users/daniel/configs/system/nvim/nvim/lua/user/init.lua b/users/daniel/configs/system/nvim/nvim/lua/user/init.lua deleted file mode 100644 index acd7479..0000000 --- a/users/daniel/configs/system/nvim/nvim/lua/user/init.lua +++ /dev/null @@ -1,84 +0,0 @@ -return { - -- Configure AstroNvim updates - updater = { - remote = "origin", -- remote to use - channel = "stable", -- "stable" or "nightly" - version = "latest", -- "latest", tag name, or regex search like "v1.*" to only do updates before v2 (STABLE ONLY) - branch = "nightly", -- branch name (NIGHTLY ONLY) - commit = nil, -- commit hash (NIGHTLY ONLY) - pin_plugins = nil, -- nil, true, false (nil will pin plugins on stable only) - skip_prompts = false, -- skip prompts about breaking changes - show_changelog = true, -- show the changelog after performing an update - auto_quit = false, -- automatically quit the current session after a successful update - remotes = { -- easily add new remotes to track - -- ["remote_name"] = "https://remote_url.come/repo.git", -- full remote url - -- ["remote2"] = "github_user/repo", -- GitHub user/repo shortcut, - -- ["remote3"] = "github_user", -- GitHub user assume AstroNvim fork - }, - }, - - -- Set colorscheme to use - colorscheme = "catppuccin", - - -- Diagnostics configuration (for vim.diagnostics.config({...})) when diagnostics are on - diagnostics = { - virtual_text = true, - underline = true, - }, - - lsp = { - -- 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 - -- "sumneko_lua", - }, - 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" - }, - }, - - -- Configure require("lazy").setup() options - lazy = { - defaults = { lazy = true }, - performance = { - rtp = { - -- customize default disabled vim plugins - disabled_plugins = { "tohtml", "gzip", "matchit", "zipPlugin", "netrwPlugin", "tarPlugin" }, - }, - }, - }, - - -- This function is run last and is a good place to configuring - -- augroups/autocommands and custom filetypes also this just pure lua so - -- anything that doesn't fit in the normal config locations above can go here - polish = function() - -- Set up custom filetypes - -- vim.filetype.add { - -- extension = { - -- foo = "fooscript", - -- }, - -- filename = { - -- ["Foofile"] = "fooscript", - -- }, - -- pattern = { - -- ["~/%.config/foo/.*"] = "fooscript", - -- }, - -- } - end, -} diff --git a/users/daniel/configs/system/nvim/nvim/lua/user/options.lua b/users/daniel/configs/system/nvim/nvim/lua/user/options.lua deleted file mode 100644 index 18deac7..0000000 --- a/users/daniel/configs/system/nvim/nvim/lua/user/options.lua +++ /dev/null @@ -1,29 +0,0 @@ --- set vim options here (vim.. = value) -return { - opt = { - -- set to true or false etc. - relativenumber = true, -- sets vim.opt.relativenumber - number = true, -- sets vim.opt.number - spell = false, -- sets vim.opt.spell - signcolumn = "auto", -- sets vim.opt.signcolumn to auto - wrap = false, -- sets vim.opt.wrap - }, - g = { - mapleader = " ", -- sets vim.g.mapleader - autoformat_enabled = true, -- enable or disable auto formatting at start (lsp.formatting.format_on_save must be enabled) - cmp_enabled = true, -- enable completion at start - autopairs_enabled = true, -- enable autopairs at start - diagnostics_mode = 3, -- set the visibility of diagnostics in the UI (0=off, 1=only show in status line, 2=virtual text off, 3=all on) - icons_enabled = true, -- disable icons in the UI (disable if no nerd font is available, requires :PackerSync after changing) - ui_notifications_enabled = true, -- disable notifications when toggling UI elements - }, -} --- If you need more control, you can use the function()...end notation --- return function(local_vim) --- local_vim.opt.relativenumber = true --- local_vim.g.mapleader = " " --- local_vim.opt.whichwrap = vim.opt.whichwrap - { 'b', 's' } -- removing option from list --- local_vim.opt.shortmess = vim.opt.shortmess + { I = true } -- add to option list --- --- return local_vim --- end diff --git a/users/daniel/configs/system/nvim/nvim/lua/user/plugins/catppuccin.lua b/users/daniel/configs/system/nvim/nvim/lua/user/plugins/catppuccin.lua deleted file mode 100644 index 033c415..0000000 --- a/users/daniel/configs/system/nvim/nvim/lua/user/plugins/catppuccin.lua +++ /dev/null @@ -1,7 +0,0 @@ -return { - "catppuccin/nvim", - name = "catppuccin", - opts = { - flavour = "macchiato", - }, -} diff --git a/users/daniel/configs/system/nvim/nvim/lua/user/plugins/community.lua b/users/daniel/configs/system/nvim/nvim/lua/user/plugins/community.lua deleted file mode 100644 index 6918be5..0000000 --- a/users/daniel/configs/system/nvim/nvim/lua/user/plugins/community.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - -- Add the community repository of plugin specifications - "AstroNvim/astrocommunity", - -- example of imporing a plugin, comment out to use it or add your own - -- available plugins can be found at https://github.com/AstroNvim/astrocommunity - - -- { import = "astrocommunity.colorscheme.catppuccin" }, - -- { import = "astrocommunity.completion.copilot-lua-cmp" }, -} diff --git a/users/daniel/configs/system/nvim/nvim/lua/user/plugins/core.lua b/users/daniel/configs/system/nvim/nvim/lua/user/plugins/core.lua deleted file mode 100644 index be1fc3e..0000000 --- a/users/daniel/configs/system/nvim/nvim/lua/user/plugins/core.lua +++ /dev/null @@ -1,77 +0,0 @@ -return { - -- 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 "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 "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 - -- :with_cr(cond.none()), - -- }, - -- -- disable for .vim files, but it work for another filetypes - -- Rule("a", "a", "-vim") - -- ) - -- end, - -- }, - -- By adding to the which-key config and using our helper function you can add more which-key registered bindings - -- { - -- "folke/which-key.nvim", - -- config = function(plugin, opts) - -- require "plugins.configs.which-key"(plugin, opts) -- include the default astronvim config that calls the setup call - -- -- Add bindings which show up as group name - -- local wk = require "which-key" - -- wk.register({ - -- b = { name = "Buffer" }, - -- }, { mode = "n", prefix = "" }) - -- end, - -- }, -} diff --git a/users/daniel/configs/system/nvim/nvim/lua/user/plugins/mason.lua b/users/daniel/configs/system/nvim/nvim/lua/user/plugins/mason.lua deleted file mode 100644 index 9018347..0000000 --- a/users/daniel/configs/system/nvim/nvim/lua/user/plugins/mason.lua +++ /dev/null @@ -1,26 +0,0 @@ --- customize mason plugins -return { - -- use mason-lspconfig to configure LSP installations - { - "williamboman/mason-lspconfig.nvim", - -- overrides `require("mason-lspconfig").setup(...)` - opts = { - -- ensure_installed = { "lua_ls" }, - }, - }, - -- 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 = { "prettier", "stylua" }, - }, - }, - { - "jay-babu/mason-nvim-dap.nvim", - -- overrides `require("mason-nvim-dap").setup(...)` - opts = { - -- ensure_installed = { "python" }, - }, - }, -} diff --git a/users/daniel/configs/system/nvim/nvim/lua/user/plugins/null-ls.lua b/users/daniel/configs/system/nvim/nvim/lua/user/plugins/null-ls.lua deleted file mode 100644 index beceeda..0000000 --- a/users/daniel/configs/system/nvim/nvim/lua/user/plugins/null-ls.lua +++ /dev/null @@ -1,17 +0,0 @@ -return { - "jose-elias-alvarez/null-ls.nvim", - opts = function(_, config) - -- config 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/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/formatting - -- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics - config.sources = { - -- Set a formatter - -- null_ls.builtins.formatting.stylua, - -- null_ls.builtins.formatting.prettier, - } - return config -- return final config table - end, -} diff --git a/users/daniel/configs/system/nvim/nvim/lua/user/plugins/treesitter.lua b/users/daniel/configs/system/nvim/nvim/lua/user/plugins/treesitter.lua deleted file mode 100644 index 092d7a8..0000000 --- a/users/daniel/configs/system/nvim/nvim/lua/user/plugins/treesitter.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "nvim-treesitter/nvim-treesitter", - opts = { - -- ensure_installed = { "lua" }, - }, -} diff --git a/users/daniel/configs/system/nvim/nvim/lua/user/plugins/user.lua b/users/daniel/configs/system/nvim/nvim/lua/user/plugins/user.lua deleted file mode 100644 index acdbf63..0000000 --- a/users/daniel/configs/system/nvim/nvim/lua/user/plugins/user.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - -- You can also add new plugins here as well: - -- Add plugins, the lazy syntax - -- "andweeb/presence.nvim", - -- { - -- "ray-x/lsp_signature.nvim", - -- event = "BufRead", - -- config = function() - -- require("lsp_signature").setup() - -- end, - -- }, -} diff --git a/users/daniel/default.nix b/users/daniel/default.nix index 2b7daf8..22216e2 100644 --- a/users/daniel/default.nix +++ b/users/daniel/default.nix @@ -79,10 +79,10 @@ in { imports = [ - ./configs/system + ../configs/system ] ++ lib.optionals (!headless) [ - ./configs/desktop + ../configs/desktop ] ++ lib.optionals (builtins.pathExists ./host-specific/${hostname}) [ ./host-specific/${hostname} diff --git a/users/deck/default.nix b/users/deck/default.nix new file mode 100644 index 0000000..86fbb45 --- /dev/null +++ b/users/deck/default.nix @@ -0,0 +1,114 @@ +{ + pkgs, + lib, + fetchurl, + hostname, + headless, + ... +}: let + packages = with pkgs; [ + age + direnv + elixir + elixir_ls + entr + erlang + feh + go + gopls + iosevka + minisign + nodejs + oh-my-zsh + rust-analyzer + unzip + zip + ]; + + defaultUser = "deck"; +in { + imports = [ + ../configs/system + ]; + + home = { + username = defaultUser; + homeDirectory = "/home/${defaultUser}"; + sessionPath = [ + "$HOME/go/bin" + ]; + + file = { + ".icons/default".source = "${pkgs.capitaine-cursors}/share/icons/capitaine-cursors"; + }; + + packages = packages; + + keyboard = { + layout = "gb"; + options = [ + "caps:escape" + ]; + }; + + stateVersion = "23.05"; + }; + + programs = { + # Let Home Manager install and manage itself. + home-manager.enable = true; + + fzf = { + enable = true; + enableZshIntegration = true; + }; + + git = { + enable = true; + package = pkgs.gitFull; + userName = "Daniel Patterson"; + userEmail = "me@danielpatterson.dev"; + extraConfig = { + pull.rebase = true; + init.defaultBranch = "main"; + format.signOff = "yes"; + sendemail = { + smtpUser = "me@danielpatterson.dev"; + smtpServer = "smtp.fastmail.com"; + smtpEncryption = "tls"; + smtpServerPort = 587; + }; + }; + }; + + lazygit = { + enable = true; + settings = { + gui.theme = { + selectedLineBgColor = ["reverse"]; + selectedRangeBgColor = ["reverse"]; + }; + }; + }; + + starship.enable = true; + + vscode.enable = true; + + zsh = { + enable = true; + enableAutosuggestions = true; + initExtra = '' + if [ -n "$TMUX" ]; then + setopt ignoreeof + fi + eval "$(direnv hook zsh)" + ''; + oh-my-zsh = { + enable = true; + plugins = ["git" "fzf"]; + theme = "agnoster"; + }; + }; + }; +}