From 52e3b73c6d806b19c1888cecec1df27a93d3a228 Mon Sep 17 00:00:00 2001 From: cnst Date: Wed, 4 Sep 2024 15:35:27 +0200 Subject: [PATCH] some helix changes but mainly removing a user --- flake.lock | 71 ++----- flake.nix | 6 +- home/modules/default.nix | 1 - home/modules/devtools/helix/default.nix | 45 +++- .../helix/{languages.nix => lang.nix} | 22 +- home/modules/devtools/helix/theme.nix | 201 ++++++++++++++++++ home/modules/utils/ags/.gitignore | 3 - home/modules/utils/ags/default.nix | 57 ----- home/modules/wm/hyprland/cnst/keybinds.nix | 4 +- home/users/cnst/cpmodules.nix | 107 ++++++++++ home/users/cnst/default.nix | 20 +- home/users/cnst/export-user-modules.nix | 4 - home/users/cnst/modules.nix | 6 - home/users/cnst/shell.nix | 21 +- hosts/{adampad => cnixpad}/default.nix | 2 +- .../hardware-configuration.nix | 0 hosts/{adampad => cnixpad}/modules.nix | 4 +- hosts/default.nix | 15 +- system/dev/default.nix | 1 + system/modules/utils/misc/default.nix | 1 + system/nix/nh/adampad/default.nix | 9 - system/nix/nh/{cnix => cnst}/default.nix | 0 .../nix/nh/{toothpc => toothpick}/default.nix | 0 23 files changed, 421 insertions(+), 179 deletions(-) rename home/modules/devtools/helix/{languages.nix => lang.nix} (91%) create mode 100644 home/modules/devtools/helix/theme.nix delete mode 100644 home/modules/utils/ags/.gitignore delete mode 100644 home/modules/utils/ags/default.nix create mode 100644 home/users/cnst/cpmodules.nix delete mode 100644 home/users/cnst/export-user-modules.nix rename hosts/{adampad => cnixpad}/default.nix (97%) rename hosts/{adampad => cnixpad}/hardware-configuration.nix (100%) rename hosts/{adampad => cnixpad}/modules.nix (97%) delete mode 100644 system/nix/nh/adampad/default.nix rename system/nix/nh/{cnix => cnst}/default.nix (100%) rename system/nix/nh/{toothpc => toothpick}/default.nix (100%) diff --git a/flake.lock b/flake.lock index 45555346..80cba506 100644 --- a/flake.lock +++ b/flake.lock @@ -21,32 +21,11 @@ "type": "github" } }, - "ags": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_2" - }, - "locked": { - "lastModified": 1721306136, - "narHash": "sha256-VKPsIGf3/a+RONBipx4lEE4LXG2sdMNkWQu22LNQItg=", - "owner": "Aylur", - "repo": "ags", - "rev": "344ea72cd3b8d4911f362fec34bce7d8fb37028c", - "type": "github" - }, - "original": { - "owner": "Aylur", - "repo": "ags", - "type": "github" - } - }, "anyrun": { "inputs": { "flake-parts": "flake-parts", "nixpkgs": "nixpkgs_2", - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1721135360, @@ -119,7 +98,7 @@ "home-manager": "home-manager_2", "jovian": "jovian", "nixpkgs": "nixpkgs_3", - "systems": "systems_4", + "systems": "systems_3", "yafas": "yafas" }, "locked": { @@ -442,7 +421,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -480,7 +459,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1709126324, @@ -498,7 +477,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1710146030, @@ -764,7 +743,7 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_5", - "systems": "systems_7", + "systems": "systems_6", "xdph": "xdph" }, "locked": { @@ -1392,7 +1371,6 @@ "root": { "inputs": { "agenix": "agenix", - "ags": "ags", "anyrun": "anyrun", "chaotic": "chaotic", "fenix": "fenix_2", @@ -1415,7 +1393,7 @@ "nixpak": "nixpak", "nixpkgs": "nixpkgs_8", "nixpkgs-small": "nixpkgs-small", - "systems": "systems_8", + "systems": "systems_7", "wezterm": "wezterm" } }, @@ -1567,16 +1545,16 @@ }, "systems_4": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1597,16 +1575,16 @@ }, "systems_6": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1626,21 +1604,6 @@ } }, "systems_8": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_9": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/flake.nix b/flake.nix index 406ea0d7..5364a724 100644 --- a/flake.nix +++ b/flake.nix @@ -107,11 +107,7 @@ anyrun.url = "github:anyrun-org/anyrun"; microfetch.url = "github:NotAShelf/microfetch"; agenix.url = "github:ryantm/agenix"; - ags = { - url = "github:Aylur/ags"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - # rust toolchain + # rust toolchain fenix = { url = "github:nix-community/fenix"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/modules/default.nix b/home/modules/default.nix index 2375f89e..044fee89 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -16,7 +16,6 @@ "${userModules}/userd/copyq" "${userModules}/userd/mako" "${userModules}/userd/udiskie" - "${userModules}/utils/ags" "${userModules}/utils/anyrun" "${userModules}/utils/misc" "${userModules}/utils/rofi" diff --git a/home/modules/devtools/helix/default.nix b/home/modules/devtools/helix/default.nix index 7d580729..fa2cb6dd 100644 --- a/home/modules/devtools/helix/default.nix +++ b/home/modules/devtools/helix/default.nix @@ -8,7 +8,10 @@ inherit (lib) mkIf mkEnableOption; cfg = config.modules.devtools.helix; in { - imports = [./languages.nix]; + imports = [ + ./lang.nix + ./theme.nix + ]; options = { modules.devtools.helix.enable = mkEnableOption "Enable helix"; @@ -20,16 +23,17 @@ in { package = inputs.helix.packages.${pkgs.system}.default; settings = { - theme = "gruvbox_material_dark_soft"; + theme = "gruvbox_custom"; editor = { color-modes = true; + scrolloff = 0; cursorline = true; cursor-shape = { insert = "bar"; normal = "block"; select = "underline"; }; - indent-guides.render = true; + indent-guides.render = false; inline-diagnostics = { cursor-line = "hint"; other-lines = "error"; @@ -43,18 +47,41 @@ in { }; }; - keys = { + keys = let + spaceMode = { + space = "file_picker"; + n = "global_search"; + f = ":format"; + c = "toggle_comments"; + t = { + d = "goto_type_definition"; + i = "goto_implementation"; + r = "goto_reference"; + t = "goto_definition"; + w = "trim_selections"; + }; + x = ":buffer-close"; + w = ":w"; + q = ":q"; + y = "yank"; + p = "paste_after"; + P = "paste_before"; + R = "replace_with_yanked"; + }; + in { normal = { y = "yank_to_clipboard"; p = "paste_clipboard_after"; - space.u = { - f = ":format"; # format using LSP formatter - w = ":set whitespace.render all"; - W = ":set whitespace.render none"; - }; + C-a = "select_all"; + del = "delete_selection"; + space = spaceMode; }; insert = { C-v = "paste_clipboard_after"; + C-c = "yank_to_clipboard"; + }; + select = { + space = spaceMode; }; }; }; diff --git a/home/modules/devtools/helix/languages.nix b/home/modules/devtools/helix/lang.nix similarity index 91% rename from home/modules/devtools/helix/languages.nix rename to home/modules/devtools/helix/lang.nix index 35f8bc24..0c7d83f7 100644 --- a/home/modules/devtools/helix/languages.nix +++ b/home/modules/devtools/helix/lang.nix @@ -78,6 +78,24 @@ auto-format = true; language-servers = ["dprint" "typescript-language-server"]; } + { + name = "php"; + auto-format = true; + } + { + name = "css"; + auto-format = true; + language-servers = ["vscode-css-language-server"]; + } + { + name = "rust"; + auto-format = true; + file-types = ["rs"]; + language-servers = ["rust-analyzer"]; + formatter = { + command = lib.getExe pkgs.rustfmt; + }; + } ] ++ prettierLangs langs; @@ -95,7 +113,7 @@ cmake-language-server = { command = lib.getExe pkgs.cmake-language-server; }; - + lua-language-server = { command = lib.getExe pkgs.lua-language-server; }; @@ -175,7 +193,7 @@ }; vscode-css-language-server = { - command = "${pkgs.nodePackages.vscode-langservers-extracted}/bin/vscode-css-languageserver"; + command = "${pkgs.nodePackages.vscode-langservers-extracted}/bin/vscode-css-language-server"; args = ["--stdio"]; config = { provideFormatter = true; diff --git a/home/modules/devtools/helix/theme.nix b/home/modules/devtools/helix/theme.nix new file mode 100644 index 00000000..f5333300 --- /dev/null +++ b/home/modules/devtools/helix/theme.nix @@ -0,0 +1,201 @@ +{ + programs.helix.themes = { + gruvbox_custom = let + bg0 = "#32302f"; + bg1 = "#3c3836"; + bg2 = "#3c3836"; + bg3 = "#504945"; + bg4 = "#504945"; + fg0 = "#d4be98"; + red = "#ea6962"; + orange = "#e78a4e"; + yellow = "#d8a657"; + bg_visual_yellow = "#574833"; + green = "#a9b665"; + aqua = "#89b482"; + blue = "#7daea3"; + purple = "#d3869b"; + grey0 = "#7c6f64"; + grey2 = "#a89984"; + in { + "type" = yellow; + "constant" = purple; + "constant.numeric" = purple; + "constant.character.escape" = orange; + "string" = green; + "string.regexp" = blue; + "comment" = grey0; + "variable" = fg0; + "variable.builtin" = blue; + "variable.parameter" = fg0; + "variable.other.member" = fg0; + "label" = aqua; + "punctuation" = grey2; + "punctuation.delimiter" = grey2; + "punctuation.bracket" = fg0; + "keyword" = red; + "keyword.directive" = aqua; + "operator" = orange; + "function" = green; + "function.builtin" = blue; + "function.macro" = aqua; + "tag" = yellow; + "namespace" = aqua; + "attribute" = aqua; + "constructor" = yellow; + "module" = blue; + "special" = orange; + "markup.heading.marker" = grey2; + "markup.heading.1" = { + fg = red; + modifiers = ["bold"]; + }; + "markup.heading.2" = { + fg = orange; + modifiers = ["bold"]; + }; + "markup.heading.3" = { + fg = yellow; + modifiers = ["bold"]; + }; + "markup.heading.4" = { + fg = green; + modifiers = ["bold"]; + }; + "markup.heading.5" = { + fg = blue; + modifiers = ["bold"]; + }; + "markup.heading.6" = { + fg = fg0; + modifiers = ["bold"]; + }; + "markup.list" = red; + "markup.bold" = {modifiers = ["bold"];}; + "markup.italic" = {modifiers = ["italic"];}; + "markup.link.url" = { + fg = blue; + modifiers = ["underlined"]; + }; + "markup.link.text" = purple; + "markup.quote" = grey2; + "markup.raw" = green; + + "diff.plus" = green; + "diff.delta" = orange; + "diff.minus" = red; + + "ui.background" = {bg = bg0;}; + "ui.background.separator" = grey0; + "ui.cursor" = { + fg = bg0; + bg = fg0; + }; + "ui.cursor.match" = { + fg = orange; + bg = bg_visual_yellow; + }; + "ui.cursor.insert" = { + fg = bg0; + bg = grey2; + }; + "ui.cursor.select" = { + fg = bg0; + bg = blue; + }; + "ui.cursorline.primary" = {bg = bg1;}; + "ui.cursorline.secondary" = {bg = bg1;}; + "ui.selection" = {bg = bg3;}; + "ui.linenr" = grey0; + "ui.linenr.selected" = fg0; + "ui.statusline" = { + fg = fg0; + bg = bg3; + }; + "ui.statusline.inactive" = { + fg = grey0; + bg = bg1; + }; + "ui.statusline.normal" = { + fg = bg0; + bg = fg0; + modifiers = ["bold"]; + }; + "ui.statusline.insert" = { + fg = bg0; + bg = yellow; + modifiers = ["bold"]; + }; + "ui.statusline.select" = { + fg = bg0; + bg = blue; + modifiers = ["bold"]; + }; + "ui.bufferline" = { + fg = grey0; + bg = bg1; + }; + "ui.bufferline.active" = { + fg = fg0; + bg = bg3; + modifiers = ["bold"]; + }; + "ui.popup" = { + fg = grey2; + bg = bg2; + }; + "ui.window" = { + fg = grey0; + bg = bg0; + }; + "ui.help" = { + fg = fg0; + bg = bg2; + }; + "ui.text" = fg0; + "ui.text.focus" = fg0; + "ui.menu" = { + fg = fg0; + bg = bg3; + }; + "ui.menu.selected" = { + fg = bg0; + bg = blue; + modifiers = ["bold"]; + }; + "ui.virtual.whitespace" = {fg = bg4;}; + "ui.virtual.indent-guide" = {fg = bg4;}; + "ui.virtual.ruler" = {bg = bg3;}; + + "hint" = blue; + "info" = aqua; + "warning" = yellow; + "error" = red; + "diagnostic" = {underline = {style = "curl";};}; + "diagnostic.hint" = { + underline = { + color = blue; + style = "dotted"; + }; + }; + "diagnostic.info" = { + underline = { + color = aqua; + style = "dotted"; + }; + }; + "diagnostic.warning" = { + underline = { + color = yellow; + style = "curl"; + }; + }; + "diagnostic.error" = { + underline = { + color = red; + style = "curl"; + }; + }; + }; + }; +} diff --git a/home/modules/utils/ags/.gitignore b/home/modules/utils/ags/.gitignore deleted file mode 100644 index b78d65d7..00000000 --- a/home/modules/utils/ags/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -style.css -style.css.map -types diff --git a/home/modules/utils/ags/default.nix b/home/modules/utils/ags/default.nix deleted file mode 100644 index ca34ef44..00000000 --- a/home/modules/utils/ags/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - inputs, - pkgs, - lib, - config, - ... -}: let - requiredDeps = with pkgs; [ - bash - bun - coreutils - dart-sass - gawk - imagemagick - procps - ripgrep - util-linux - ]; - - guiDeps = with pkgs; [ - gnome.gnome-control-center - mission-center - overskride - wlogout - ]; - - dependencies = requiredDeps ++ guiDeps; - inherit (lib) mkIf mkEnableOption; - cfg = config.modules.utils.ags; -in { - imports = [ - inputs.ags.homeManagerModules.default - ]; - options = { - modules.utils.ags.enable = mkEnableOption "Enables ags"; - }; - - config = mkIf cfg.enable { - programs.ags.enable = true; - - systemd.user.services.ags = { - Unit = { - Description = "Aylur's Gtk Shell"; - PartOf = [ - "tray.target" - "graphical-session.target" - ]; - }; - Service = { - Environment = "PATH=/run/wrappers/bin:${lib.makeBinPath dependencies}"; - ExecStart = "${cfg.package}/bin/ags"; - Restart = "on-failure"; - }; - Install.WantedBy = ["graphical-session.target"]; - }; - }; -} diff --git a/home/modules/wm/hyprland/cnst/keybinds.nix b/home/modules/wm/hyprland/cnst/keybinds.nix index 8c0a1971..39ccdd5d 100644 --- a/home/modules/wm/hyprland/cnst/keybinds.nix +++ b/home/modules/wm/hyprland/cnst/keybinds.nix @@ -2,9 +2,11 @@ lib, config, pkgs, + osConfig, ... }: let inherit (lib) mkIf mkEnableOption; + modKey = if osConfig.networking.hostName == "cnixpad" then "ALT_L" else "SUPER"; cfg = config.modules.wm.hyprland.cnst.keybinds; in { options = { @@ -22,7 +24,7 @@ in { "$yazi" = "wezterm -e yazi"; # See https://wiki.hyprland.org/Configuring/Keywords/ for more - "$mod" = "SUPER"; + "$mod" = modKey; bind = let grimblast = lib.getExe pkgs.grimblast; diff --git a/home/users/cnst/cpmodules.nix b/home/users/cnst/cpmodules.nix new file mode 100644 index 00000000..cbf1a4c9 --- /dev/null +++ b/home/users/cnst/cpmodules.nix @@ -0,0 +1,107 @@ +{lib, ...}: let + inherit (lib) mkForce; +in { + modules = { + # browsers = { + # firefox = { + # enable = mkForce true; + # }; + # chromium = { + # enable = mkForce true; + # }; + # }; + # comm = { + # discord = { + # enable = mkForce true; + # }; + # }; + # devtools = { + # neovim = { + # enable = mkForce true; + # }; + # vscode = { + # enable = mkForce false; + # }; + # helix = { + # enable = mkForce true; + # }; + # }; + # gaming = { + # lutris = { + # enable = mkForce false; + # }; + # mangohud = { + # enable = mkForce false; + # }; + # }; + # terminal = { + # alacritty = { + # enable = mkForce true; + # }; + # foot = { + # enable = mkForce true; + # }; + # kitty = { + # enable = mkForce true; + # }; + # wezterm = { + # enable = mkForce true; + # }; + # zellij = { + # enable = mkForce false; + # }; + # }; + # userd = { + # copyq = { + # enable = mkForce true; + # }; + # mako = { + # enable = mkForce true; + # }; + # udiskie = { + # enable = mkForce true; + # }; + # }; + # utils = { + # anyrun = { + # enable = mkForce false; + # }; + # rofi = { + # enable = mkForce false; + # }; + # waybar = { + # enable = mkForce true; + # }; + # yazi = { + # enable = mkForce true; + # }; + # zathura = { + # enable = mkForce true; + # }; + # misc = { + # enable = mkForce true; + # }; + # }; + # wm = { + # hyprland = { + # cnst = { + # enable = mkForce true; + # }; + # toothpick = { + # enable = mkForce false; + # }; + # }; + # utils = { + # hypridle = { + # enable = mkForce true; + # }; + # hyprlock = { + # enable = mkForce true; + # }; + # hyprpaper = { + # enable = mkForce true; + # }; + # }; + # }; + }; +} diff --git a/home/users/cnst/default.nix b/home/users/cnst/default.nix index eb823595..f953d3e4 100644 --- a/home/users/cnst/default.nix +++ b/home/users/cnst/default.nix @@ -1,9 +1,17 @@ -{pkgs, ...}: { +{ + pkgs, + lib, + osConfig, + ... +}: let + isCnixpad = osConfig.networking.hostName == "cnixpad"; + in { imports = [ - ./modules.nix - ./git.nix - ./shell.nix - ]; + ./modules.nix + ./git.nix + ./shell.nix + ] + ++ lib.optionals isCnixpad [ ./cpmodules.nix ]; home = { username = "cnst"; homeDirectory = "/home/cnst"; @@ -15,7 +23,7 @@ ]; sessionVariables = { BROWSER = "firefox"; - EDITOR = "nvim"; + EDITOR = "hx"; TERM = "xterm-256color"; STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/cnst/.steam/root/compatibilitytools.d"; # proton and steam compat diff --git a/home/users/cnst/export-user-modules.nix b/home/users/cnst/export-user-modules.nix deleted file mode 100644 index f7fd1807..00000000 --- a/home/users/cnst/export-user-modules.nix +++ /dev/null @@ -1,4 +0,0 @@ -let - modules = import ./modules.nix; -in - builtins.toJSON modules diff --git a/home/users/cnst/modules.nix b/home/users/cnst/modules.nix index 1eff977b..cd8af596 100644 --- a/home/users/cnst/modules.nix +++ b/home/users/cnst/modules.nix @@ -61,9 +61,6 @@ }; }; utils = { - ags = { - enable = false; - }; anyrun = { enable = false; }; @@ -91,9 +88,6 @@ toothpick = { enable = false; }; - adam = { - enable = false; - }; }; utils = { hypridle = { diff --git a/home/users/cnst/shell.nix b/home/users/cnst/shell.nix index 7eaa6e7f..f56c41cf 100644 --- a/home/users/cnst/shell.nix +++ b/home/users/cnst/shell.nix @@ -7,18 +7,18 @@ syntaxHighlighting.enable = true; shellAliases = { - usermodules = "nvim /home/cnst/.nix-config/home/users/cnst/modules.nix"; - umod = "nvim /home/cnst/.nix-config/home/users/cnst/modules.nix"; - systemmodules = "nvim /home/cnst/.nix-config/hosts/cnix/modules.nix"; - smod = "nvim /home/cnst/.nix-config/hosts/cnix/modules.nix"; - nixclean = "sudo nix run /home/cnst/.nix-config#cleanup-boot"; + usermodules = "$EDITOR /home/$USER/.nix-config/home/users/$USER/modules.nix"; + umod = "$EDITOR /home/$USER/.nix-config/home/users/$USER/modules.nix"; + systemmodules = "$EDITOR /home/$USER/.nix-config/hosts/$HOST/modules.nix"; + smod = "$EDITOR /home/$USER/.nix-config/hosts/$HOST/modules.nix"; + nixclean = "sudo nix run /home/$USER/.nix-config#cleanup-boot"; nixdev = "nix develop ~/.nix-config -c $SHELL"; - nixconfig = "cd /home/cnst/.nix-config/"; + nixconfig = "cd /home/$USER/.nix-config/"; ll = "ls -l"; - nixupdate = "nh os switch -v -H cnix && sudo nix run /home/cnst/.nix-config#cleanup-boot"; - nixup = "nh os switch -H cnix && sudo nix run /home/cnst/.nix-config#cleanup-boot"; - flakeupdate = "nh os switch -u -v -H cnix && sudo nix run /home/cnst/.nix-config#cleanup-boot"; - flakeup = "nh os switch -u -H cnix && sudo nix run /home/cnst/.nix-config#cleanup-boot"; + nixupdate = "nh os switch -v -H $HOST && sudo nix run /home/$USER/.nix-config#cleanup-boot"; + nixup = "nh os switch -H $HOST && sudo nix run /home/$USER/.nix-config#cleanup-boot"; + flakeupdate = "nh os switch -u -v -H $HOST && sudo nix run /home/$USER/.nix-config#cleanup-boot"; + flakeup = "nh os switch -u -H $HOST && sudo nix run /home/$USER/.nix-config#cleanup-boot"; }; history = { size = 1000; @@ -28,7 +28,6 @@ enable = true; plugins = [ "git" - # "thefuck" ]; theme = "robbyrussell"; }; diff --git a/hosts/adampad/default.nix b/hosts/cnixpad/default.nix similarity index 97% rename from hosts/adampad/default.nix rename to hosts/cnixpad/default.nix index 3e205ad4..e5562e82 100644 --- a/hosts/adampad/default.nix +++ b/hosts/cnixpad/default.nix @@ -6,7 +6,7 @@ }: let ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups; in { - users.users.adam = { + users.users.cnst = { isNormalUser = true; shell = pkgs.zsh; # openssh.authorizedKeys.keys = []; diff --git a/hosts/adampad/hardware-configuration.nix b/hosts/cnixpad/hardware-configuration.nix similarity index 100% rename from hosts/adampad/hardware-configuration.nix rename to hosts/cnixpad/hardware-configuration.nix diff --git a/hosts/adampad/modules.nix b/hosts/cnixpad/modules.nix similarity index 97% rename from hosts/adampad/modules.nix rename to hosts/cnixpad/modules.nix index 9a1c7caf..8cee364b 100644 --- a/hosts/adampad/modules.nix +++ b/hosts/cnixpad/modules.nix @@ -42,7 +42,7 @@ }; network = { enable = true; - hostName = "adampad"; + hostName = "cnixpad"; interfaces = { "wlp6s0" = { allowedTCPPorts = [22 80 443]; @@ -113,7 +113,7 @@ utils = { agenix = { enable = true; - adampad = { + cnixpad = { enable = true; }; }; diff --git a/hosts/default.nix b/hosts/default.nix index 65d8a0a7..eb5edfe8 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -13,7 +13,6 @@ cnstConfig = "${self}/home/users/cnst"; toothpickConfig = "${self}/home/users/toothpick"; - adamConfig = "${self}/home/users/adam"; userModules = "${self}/home/modules"; systemModules = "${self}/system/modules"; @@ -26,7 +25,7 @@ inherit (import "${systemConfig}") shared; # get these into the module system - specialArgs = {inherit inputs self userConfig systemConfig hostConfig cnstConfig toothpickConfig adamConfig userModules systemModules;}; + specialArgs = {inherit inputs self userConfig systemConfig hostConfig cnstConfig toothpickConfig userModules systemModules;}; in { cnix = nixosSystem { inherit specialArgs; @@ -35,7 +34,7 @@ ++ [ ./cnix "${mod}/boot/lanzaboote" - "${mod}/nix/nh/cnix" + "${mod}/nix/nh/cnst" "${mod}/dev" { home-manager = { @@ -54,7 +53,7 @@ ++ [ ./toothpc "${mod}/boot/lanzaboote" - "${mod}/nix/nh/toothpc" + "${mod}/nix/nh/toothpick" "${mod}/dev" { home-manager = { @@ -66,18 +65,18 @@ inputs.agenix.nixosModules.default ]; }; - adampad = nixosSystem { + cnixpad = nixosSystem { inherit specialArgs; modules = shared ++ [ - ./adampad + ./cnixpad "${mod}/boot" - "${mod}/nix/nh/adampad" + "${mod}/nix/nh/cnst" "${mod}/dev" { home-manager = { - users.adam.imports = homeImports."adam@adampad"; + users.cnst.imports = homeImports."cnst@cnixpad"; extraSpecialArgs = specialArgs; }; } diff --git a/system/dev/default.nix b/system/dev/default.nix index ed763faa..4cd5cd5f 100644 --- a/system/dev/default.nix +++ b/system/dev/default.nix @@ -37,6 +37,7 @@ clang-tools marksman pyright + nodePackages_latest.intelephense # Formatters alejandra diff --git a/system/modules/utils/misc/default.nix b/system/modules/utils/misc/default.nix index e90d34e4..1d1ce125 100644 --- a/system/modules/utils/misc/default.nix +++ b/system/modules/utils/misc/default.nix @@ -16,6 +16,7 @@ in { pkgs.ripgrep pkgs.fd pkgs.beekeeper-studio + pkgs.gnused ]; }; } diff --git a/system/nix/nh/adampad/default.nix b/system/nix/nh/adampad/default.nix deleted file mode 100644 index e08a19c3..00000000 --- a/system/nix/nh/adampad/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - environment.variables.FLAKE = "/home/adam/.nix-config"; - programs = { - nh = { - enable = true; - flake = "/home/adam/.nix-config"; - }; - }; -} diff --git a/system/nix/nh/cnix/default.nix b/system/nix/nh/cnst/default.nix similarity index 100% rename from system/nix/nh/cnix/default.nix rename to system/nix/nh/cnst/default.nix diff --git a/system/nix/nh/toothpc/default.nix b/system/nix/nh/toothpick/default.nix similarity index 100% rename from system/nix/nh/toothpc/default.nix rename to system/nix/nh/toothpick/default.nix