diff --git a/maskiner/core/configuration.nix b/maskiner/core/configuration.nix index c43295a..e99b4ab 100644 --- a/maskiner/core/configuration.nix +++ b/maskiner/core/configuration.nix @@ -110,6 +110,7 @@ in }; }; + boot.kernelPackages = pkgs.linuxPackages_latest; networking.hostName = myhostname; diff --git a/moduler/dev.nix b/moduler/dev.nix index 8994d1c..b403cb1 100644 --- a/moduler/dev.nix +++ b/moduler/dev.nix @@ -7,9 +7,9 @@ ... }: let - go-migrate-pg = pkgs.go-migrate.overrideAttrs (oldAttrs: { - tags = [ "postgres" ]; - }); + # go-migrate-pg = pkgs.go-migrate.overrideAttrs (oldAttrs: { + # tags = [ "postgres" ]; + # }); in { nix.settings.trusted-users = [ @@ -19,46 +19,42 @@ in environment.systemPackages = with pkgs; [ # Neovim - inputs.neovim-nightly-overlay.packages.${pkgs.system}.default + inputs.neovim-nightly-overlay.packages.${pkgs.stdenv.hostPlatform.system}.default # Nix devenv nixfmt-rfc-style - opentofu # Docker dive lazydocker # Jobb - azure-cli dotnetCorePackages.dotnet_9.sdk - jira-cli-go gh - mermaid-cli - - # Minio awscli minio-client + # opentofu + # azure-cli + # jira-cli-go # Blogging - hugo zola # System Design - sqlc - postgresql - plantuml + # sqlc + # postgresql + # plantuml # Web Dev - tailwindcss + # tailwindcss prettierd # Go - air go - templ - go-migrate-pg + # air + # templ + # go-migrate-pg # Build git diff --git a/moduler/home.nix b/moduler/home.nix index 0b372b8..ae11cf8 100644 --- a/moduler/home.nix +++ b/moduler/home.nix @@ -13,7 +13,7 @@ ../moduler/kitty.nix ../moduler/dunst.nix ../moduler/nixpkgs.nix - ../moduler/firefox.nix + # ../moduler/firefox.nix ../moduler/zathura.nix ../moduler/lazygit.nix ../moduler/ssh.nix @@ -23,7 +23,6 @@ ../moduler/programs/k9s ]; - programs.home-manager.enable = true; programs.fish.enable = true; diff --git a/moduler/lsp.nix b/moduler/lsp.nix index 261fae2..21a85bd 100644 --- a/moduler/lsp.nix +++ b/moduler/lsp.nix @@ -1,11 +1,8 @@ -# This is your system's configuration file. -# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) { inputs, lib, config, pkgs, - myhostname, ... }: { @@ -14,19 +11,20 @@ nixd gopls omnisharp-roslyn - nodePackages.vscode-json-languageserver - tailwindcss-language-server dockerfile-language-server - nodejs_22 bash-language-server helm-ls yaml-language-server - vue-language-server - vtsls - typescript - typescript-language-server lua-language-server marksman tofu-ls + + # nodejs_22 + # vue-language-server + # vtsls + # typescript + # typescript-language-server + # nodePackages.vscode-json-languageserver + # tailwindcss-language-server ]; } diff --git a/moduler/network.nix b/moduler/network.nix index 9ad4e2b..aa0268f 100644 --- a/moduler/network.nix +++ b/moduler/network.nix @@ -16,23 +16,19 @@ }; environment.systemPackages = with pkgs; [ - openvpn networkmanagerapplet - wireguard-tools networkmanager - openssh - - (octodns.withProviders (ps: [ - octodns-providers.gandi - ])) - - mtr # A network diagnostic tool iperf3 - dnsutils # `dig` + `nslookup` - ldns # replacement of `dig`, it provide the command `drill` - aria2 # A lightweight multi-protocol & multi-source command-line download utility - socat # replacement of openbsd-netcat - nmap # A utility for network discovery and security auditing - ipcalc # it is a calculator for the IPv4/v6 addresses + dnsutils + aria2 + nmap + ipcalc + + # openvpn + # openssh + # wireguard-tools + # (octodns.withProviders (ps: [ + # octodns-providers.gandi + # ])) ]; } diff --git a/moduler/programs.nix b/moduler/programs.nix index be38936..1075769 100644 --- a/moduler/programs.nix +++ b/moduler/programs.nix @@ -1,11 +1,8 @@ -# This is your system's configuration file. -# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) { inputs, lib, config, pkgs, - myhostname, ... }: { @@ -14,6 +11,7 @@ KERNEL=="ttyACM0", MODE:="666" ACTION=="add", KERNEL=="sd[a-e][0-9]", ENV{ID_FS_UUID}=="3039-3932", RUN+="${pkgs.systemd}/bin/systemd-mount --no-block -A -G -o gid=users,fmask=113,dmask=002 /dev/%k /mnt/sdcard" ACTION=="add", KERNEL=="sd[a-e]", ENV{ID_FS_UUID}=="66BA-4EBA", RUN+="${pkgs.systemd}/bin/systemd-mount --no-block -A -G -o gid=users,fmask=113,dmask=002 /dev/%k /mnt/kobo" + KERNEL=="uinput", GROUP="input", MODE="0660", OPTIONS+="static_node=uinput" ''; packages = with pkgs; [ vial @@ -29,16 +27,15 @@ thunderbird discord slack - vial - via drawio - freecad-wayland evince spotify - ansible + angryipscanner + + # ansible + # freecad-wayland # TUI - mpc codex # Browsers @@ -55,7 +52,6 @@ devour caligula ptouch-print - xev # Transforms yt-dlp @@ -64,6 +60,6 @@ pinta pastel ffmpeg - darktable + # darktable ]; } diff --git a/moduler/programs/kubernetes-tools.nix b/moduler/programs/kubernetes-tools.nix index e1c2912..4da8f79 100644 --- a/moduler/programs/kubernetes-tools.nix +++ b/moduler/programs/kubernetes-tools.nix @@ -12,10 +12,10 @@ config = lib.mkIf config.kubernetes-tools.enable { environment.systemPackages = with pkgs; [ kubectl - buildkit + # buildkit argocd - containerd - cri-tools + # containerd + # cri-tools kubectx (wrapHelm kubernetes-helm { plugins = with pkgs.kubernetes-helmPlugins; [ @@ -25,7 +25,7 @@ helm-git ]; }) - k3sup + # k3sup ]; }; diff --git a/moduler/sound.nix b/moduler/sound.nix index df2cc03..cc48455 100644 --- a/moduler/sound.nix +++ b/moduler/sound.nix @@ -22,5 +22,4 @@ }; }; }; - } diff --git a/moduler/ssh.nix b/moduler/ssh.nix index 957375c..6805ca6 100644 --- a/moduler/ssh.nix +++ b/moduler/ssh.nix @@ -4,72 +4,42 @@ enable = true; enableDefaultConfig = false; matchBlocks = { - "lth" = { - hostname = "login.student.lth.se"; - port = 22; - user = "fr7658wa-s"; - identityFile = "/home/fw/.ssh/id_rsa"; - }; - "git.wastring.com" = { - hostname = "git.wastring.com"; - port = 80; - user = "git"; - identityFile = "/home/fw/.ssh/id_ed25519"; - }; "dm2" = { hostname = "192.168.0.190"; port = 22; user = "fw"; identityFile = "/home/fw/.ssh/fw-ssh-key"; }; - "mac" = { - hostname = "192.168.0.149"; + "caddy" = { + hostname = "192.168.0.214"; port = 22; user = "ifacts"; - identityFile = "/home/fw/.ssh/ifacts-ssh-key"; + identityFile = "/home/fw/.ssh/id_ed25519"; }; - "malmo" = { - hostname = "192.168.0.138"; + "wazuh" = { + hostname = "192.168.0.200"; port = 22; user = "ifacts"; - identityFile = "/home/fw/.ssh/ifacts-ssh-key"; + identityFile = "/home/fw/.ssh/id_ed25519"; + }; + "nixos" = { + hostname = "192.168.0.218"; + port = 22; + user = "fw"; + identityFile = "/home/fw/.ssh/id_ed25519"; }; "kobo" = { hostname = "192.168.1.192"; port = 22; user = "root"; }; - "kube01" = { - hostname = "192.168.0.177"; - port = 22; - user = "fw"; - identityFile = "/home/fw/.ssh/fw-ssh-key"; - }; - "kube02" = { - hostname = "192.168.0.159"; - port = 22; - user = "fw"; - identityFile = "/home/fw/.ssh/fw-ssh-key"; - }; - "kube03" = { - hostname = "192.168.0.182"; - port = 22; - user = "fw"; - identityFile = "/home/fw/.ssh/fw-ssh-key"; - }; - "runner01" = { - hostname = "192.168.0.184"; - port = 22; - user = "fw"; - identityFile = "/home/fw/.ssh/fw-ssh-key"; - }; "docker03" = { hostname = "192.168.0.118"; port = 22; user = "fw"; identityFile = "/home/fw/.ssh/fw-ssh-key"; }; - "desktop" = { + "node" = { hostname = "192.168.1.227"; port = 22; user = "fw"; diff --git a/moduler/system.nix b/moduler/system.nix index f32f683..b865559 100644 --- a/moduler/system.nix +++ b/moduler/system.nix @@ -39,7 +39,7 @@ alsa-utils # Monitor - brightnessctl + # brightnessctl # System sops @@ -71,7 +71,7 @@ fzf eza rsync - dust + # dust ripgrep fd @@ -87,17 +87,14 @@ lazygit hyprpicker - # Terminal Stuff - chawan - go-passbolt-cli # Typesetting typst typstyle tinymist - websocat - nix-search-cli - libsixel + # websocat + # nix-search-cli + # libsixel ( let diff --git a/moduler/tmux.nix b/moduler/tmux.nix index 91b4e94..b96952a 100644 --- a/moduler/tmux.nix +++ b/moduler/tmux.nix @@ -11,7 +11,7 @@ plugins = with pkgs; [ tmuxPlugins.sensible tmuxPlugins.pain-control - { plugin = inputs.minimal-tmux.packages.${pkgs.system}.default; } + { plugin = inputs.minimal-tmux.packages.${pkgs.stdenv.hostPlatform.system}.default; } ]; extraConfig = '' set -g set-clipboard on