diff --git a/flake.nix b/flake.nix index 2f4eb3f..b656b22 100644 --- a/flake.nix +++ b/flake.nix @@ -26,8 +26,6 @@ minimal-tmux = { url = "github:niksingh710/minimal-tmux-status"; inputs.nixpkgs.follows = "nixpkgs"; - disko.url = "github:nix-community/disko"; - disko.inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -41,7 +39,6 @@ catppuccin, confetti, bbk, - disko, ... }@inputs: let @@ -88,8 +85,6 @@ catppuccin.nixosModules.catppuccin confetti.nixosModules.default bbk.nixosModules.default - ./maskiner/core/disk-config.nix - disko.nixosModules.disko ]; }; diff --git a/moduler/base.nix b/moduler/base.nix index 43087ca..3b3ae7e 100644 --- a/moduler/base.nix +++ b/moduler/base.nix @@ -6,9 +6,6 @@ ... }: { - sops.defaultSopsFile = ../secrets/sops.yaml; - sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; - nixpkgs = { config = { allowUnfree = true; @@ -96,7 +93,7 @@ garamond-libre ]; - i18n.defaultLocale = "en_US.UTF-8"; + i18n.defaultLocale = "sv_SE.UTF-8"; i18n.extraLocaleSettings = { LC_ADDRESS = "sv_SE.UTF-8"; LC_IDENTIFICATION = "sv_SE.UTF-8"; diff --git a/moduler/dev.nix b/moduler/dev.nix index b403cb1..9a099c9 100644 --- a/moduler/dev.nix +++ b/moduler/dev.nix @@ -1,9 +1,6 @@ { inputs, - lib, - config, pkgs, - myhostname, ... }: let @@ -22,24 +19,23 @@ in inputs.neovim-nightly-overlay.packages.${pkgs.stdenv.hostPlatform.system}.default # Nix - devenv nixfmt-rfc-style # Docker - dive + # dive lazydocker # Jobb - dotnetCorePackages.dotnet_9.sdk gh - awscli - minio-client + # awscli + # minio-client + # dotnetCorePackages.dotnet_9.sdk # opentofu # azure-cli # jira-cli-go # Blogging - zola + # zola # System Design # sqlc @@ -48,10 +44,10 @@ in # Web Dev # tailwindcss - prettierd + # prettierd # Go - go + # go # air # templ # go-migrate-pg @@ -59,13 +55,13 @@ in # Build git gcc - gnumake - cmake + # gnumake + # cmake # System Tools yq jq git - qrencode + # qrencode ]; } diff --git a/moduler/lsp.nix b/moduler/lsp.nix index 779dd05..218048f 100644 --- a/moduler/lsp.nix +++ b/moduler/lsp.nix @@ -5,30 +5,25 @@ ... }: { - options = { - typescript.enable = lib.mkEnableOption "enables kubernetes-tools"; - }; - config = lib.mkIf config.kubernetes-tools.enable { - environment.systemPackages = with pkgs; [ - nixd - gopls - omnisharp-roslyn - dockerfile-language-server - bash-language-server - helm-ls - yaml-language-server - lua-language-server - marksman - tofu-ls + environment.systemPackages = with pkgs; [ + nixd + dockerfile-language-server + bash-language-server + helm-ls + yaml-language-server + lua-language-server + marksman - # nodejs_22 - # vue-language-server - # vtsls - # typescript - # typescript-language-server - # nodePackages.vscode-json-languageserver - # tailwindcss-language-server - ]; - }; + # tofu-ls + # gopls + # omnisharp-roslyn + # 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 069bd23..81cf4c0 100644 --- a/moduler/network.nix +++ b/moduler/network.nix @@ -15,13 +15,12 @@ }; environment.systemPackages = with pkgs; [ - networkmanagerapplet - networkmanager - iperf3 + # networkmanager dnsutils - aria2 - nmap - ipcalc + # nmap + # ipcalc + # iperf3 + # networkmanagerapplet # (octodns.withProviders (ps: [ # octodns-providers.gandi diff --git a/moduler/programs.nix b/moduler/programs.nix index 5f9d802..4eeb050 100644 --- a/moduler/programs.nix +++ b/moduler/programs.nix @@ -8,17 +8,51 @@ { services.udev = { extraRules = '' - 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" - ''; + 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 via ]; }; - + home-manager.users.fw = { + xdg.mimeApps = { + enable = true; + defaultApplications = { + "text/html" = "librewolf.desktop"; + "x-scheme-handler/http" = "librewolf.desktop"; + "x-scheme-handler/https" = "librewolf.desktop"; + "x-scheme-handler/about" = "librewolf.desktop"; + "x-scheme-handler/unknown" = "librewolf.desktop"; + "text/plain" = "nvim.desktop"; + "text/markdown" = "nvim.desktop"; + "text/x-markdown" = "nvim.desktop"; + "application/json" = "nvim.desktop"; + "application/x-ndjson" = "nvim.desktop"; + "application/x-yaml" = "nvim.desktop"; + "text/yaml" = "nvim.desktop"; + "text/x-shellscript" = "nvim.desktop"; + "text/x-python" = "nvim.desktop"; + "text/x-csrc" = "nvim.desktop"; + "text/x-c++src" = "nvim.desktop"; + "application/x-sql" = "nvim.desktop"; + "text/xml" = "nvim.desktop"; + "application/xml" = "nvim.desktop"; + "application/pdf" = "org.gnome.Evince.desktop"; + "image/jpeg" = "feh.desktop"; + "image/png" = "feh.desktop"; + "image/gif" = "feh.desktop"; + "image/webp" = "feh.desktop"; + "image/tiff" = "feh.desktop"; + "image/bmp" = "feh.desktop"; + "image/svg+xml" = "feh.desktop"; + }; + }; + }; + environment.sessionVariables.DEFAULT_BROWSER = "${pkgs.librewolf}/bin/librewolf"; environment.systemPackages = with pkgs; [ # GUI @@ -29,10 +63,10 @@ slack drawio evince - spotify - firefox + spotify + firefox - # ansible + # ansible # freecad-wayland # TUI diff --git a/moduler/system.nix b/moduler/system.nix index 52f6139..c80b28c 100644 --- a/moduler/system.nix +++ b/moduler/system.nix @@ -21,9 +21,6 @@ poppler-utils - imagemagick - pandoc - alsa-utils sops @@ -33,19 +30,16 @@ wget htop procps - btop - procs - dysk grc vim fastfetch bc - sysstat - lm_sensors - ethtool - pciutils - usbutils + # sysstat + # lm_sensors + # ethtool + # pciutils + # usbutils fzf eza @@ -57,40 +51,37 @@ fortune cowsay - openssl - lazygit hyprpicker typst typstyle tinymist - - ( - let - base = pkgs.appimageTools.defaultFhsEnvArgs; - in - pkgs.buildFHSEnv ( - base - // { - name = "fhs"; - targetPkgs = - pkgs: - # pkgs.buildFHSUserEnv provides only a minimal FHS environment, - # lacking many basic packages needed by most software. - # Therefore, we need to add them manually. - # - # pkgs.appimageTools provides basic packages required by most software. - (base.targetPkgs pkgs) - ++ (with pkgs; [ - pkg-config - ncurses - # Feel free to add more packages here if needed. - ]); - profile = "export FHS=1"; - runScript = "bash"; - extraOutputsToInstall = [ "dev" ]; - } - ) - ) + # ( + # let + # base = pkgs.appimageTools.defaultFhsEnvArgs; + # in + # pkgs.buildFHSEnv ( + # base + # // { + # name = "fhs"; + # targetPkgs = + # pkgs: + # # pkgs.buildFHSUserEnv provides only a minimal FHS environment, + # # lacking many basic packages needed by most software. + # # Therefore, we need to add them manually. + # # + # # pkgs.appimageTools provides basic packages required by most software. + # (base.targetPkgs pkgs) + # ++ (with pkgs; [ + # pkg-config + # ncurses + # # Feel free to add more packages here if needed. + # ]); + # profile = "export FHS=1"; + # runScript = "bash"; + # extraOutputsToInstall = [ "dev" ]; + # } + # ) + # ) ]; } diff --git a/moduler/users.nix b/moduler/users.nix index 9d979d0..369153c 100644 --- a/moduler/users.nix +++ b/moduler/users.nix @@ -4,13 +4,13 @@ ... }: { - sops.secrets.user-password = { }; +# sops.secrets.user-password = { }; users = { defaultUserShell = pkgs.bash; - mutableUsers = false; users = { fw = { - hashedPasswordFile = config.sops.secrets.user-password.path; + # hashedPasswordFile = config.sops.secrets.user-password.path; + initialPassword = "password"; isNormalUser = true; description = "Fredrik Wastring"; extraGroups = [