diff options
Diffstat (limited to 'hosts')
| -rw-r--r-- | hosts/base.nix | 3 | ||||
| -rw-r--r-- | hosts/darwin.nix | 2 | ||||
| -rw-r--r-- | hosts/editors.nix | 4 | ||||
| -rw-r--r-- | hosts/local/i3.nix | 1 | ||||
| -rw-r--r-- | hosts/local/wayland.nix | 2 | ||||
| -rw-r--r-- | hosts/mac/m1mba/configuration.nix | 15 | ||||
| -rw-r--r-- | hosts/mac/m1mba/default.nix | 4 | ||||
| -rw-r--r-- | hosts/mac/m1mba/mac.nix | 12 | ||||
| -rw-r--r-- | hosts/mac/m1mba/pkgs.nix | 68 | ||||
| -rw-r--r-- | hosts/mac/mac.nix | 23 | ||||
| -rw-r--r-- | hosts/pkgs.nix | 135 | ||||
| -rw-r--r-- | hosts/users.nix | 18 |
12 files changed, 120 insertions, 167 deletions
diff --git a/hosts/base.nix b/hosts/base.nix index 96df7c4..aea25e9 100644 --- a/hosts/base.nix +++ b/hosts/base.nix @@ -1,11 +1,10 @@ {pkgs, ...}: { # fucking linux vulnerability - services.printing.enable = false; # enable flakes nix = { gc = { automatic = true; - dates = "weekly"; + interval = {Weekday = 0; Hour = 20; Minute = 0;}; options = "--delete-older-than 7d"; }; # package = pkgs.nixFlakes; diff --git a/hosts/darwin.nix b/hosts/darwin.nix index 909322b..78de32f 100644 --- a/hosts/darwin.nix +++ b/hosts/darwin.nix @@ -1,6 +1,6 @@ inputs: let mkDarwinSystem = system: path: - inputs.nixpkgs.lib.darwinSystem { + inputs.nix-darwin.lib.darwinSystem { inherit system; specialArgs = {inherit inputs;}; modules = import (./. + "/${path}") inputs; diff --git a/hosts/editors.nix b/hosts/editors.nix index b3e6e69..241ea57 100644 --- a/hosts/editors.nix +++ b/hosts/editors.nix @@ -7,8 +7,8 @@ environment.variables.F = "hx"; environment.systemPackages = [ pkgs.neovim - inputs.helix.packages.${pkgs.system}.helix + #inputs.helix.packages.${pkgs.system}.helix pkgs.nodePackages.prettier - # pkgs.helix + pkgs.helix ]; } diff --git a/hosts/local/i3.nix b/hosts/local/i3.nix index ba84982..210c0d0 100644 --- a/hosts/local/i3.nix +++ b/hosts/local/i3.nix @@ -90,6 +90,7 @@ easyeffects # games! ryujinx + wineWowPackages.staging ]; services.flatpak.enable = true; diff --git a/hosts/local/wayland.nix b/hosts/local/wayland.nix index 8f588c8..b56967c 100644 --- a/hosts/local/wayland.nix +++ b/hosts/local/wayland.nix @@ -120,6 +120,8 @@ # espeak-ng # espeak-ng-data ghostty + wineWowPackages.staging + wineWowPackages.waylandFull ]; services.speechd.enable = true; diff --git a/hosts/mac/m1mba/configuration.nix b/hosts/mac/m1mba/configuration.nix index 373f781..ed64688 100644 --- a/hosts/mac/m1mba/configuration.nix +++ b/hosts/mac/m1mba/configuration.nix @@ -1,18 +1,11 @@ {...}: { imports = [ ../../base.nix + ../../users.nix + ../../editors.nix + ../../pkgs.nix ../mac.nix - ./users.nix - ./pkgs.nix + ]; - # Auto upgrade nix package and the daemon service. - services.nix-daemon.enable = true; - # nix.package = pkgs.nix; - # Used for backwards compatibility, please read the changelog before changing. - # $ darwin-rebuild changelog - system.stateVersion = 4; - - # The platform the configuration will be used on. - nixpkgs.hostPlatform = "aarch64-darwin"; } diff --git a/hosts/mac/m1mba/default.nix b/hosts/mac/m1mba/default.nix new file mode 100644 index 0000000..3370bb0 --- /dev/null +++ b/hosts/mac/m1mba/default.nix @@ -0,0 +1,4 @@ +inputs: [ + #inputs.kmonad.nixosModules.default + ./configuration.nix +] diff --git a/hosts/mac/m1mba/mac.nix b/hosts/mac/m1mba/mac.nix deleted file mode 100644 index dba3035..0000000 --- a/hosts/mac/m1mba/mac.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: -{ - fonts.fontDir.enable = true; - fonts.fonts = with pkgs; [ - recursive - (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) - ]; - system.keyboard = { - enableKeyMapping = true; - remapCapsLockToEscape = true; - }; -} diff --git a/hosts/mac/m1mba/pkgs.nix b/hosts/mac/m1mba/pkgs.nix deleted file mode 100644 index dffcd66..0000000 --- a/hosts/mac/m1mba/pkgs.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ pkgs, kmonad, unstablePkgs, ...}: - -{ -# custom -# y.kmonad.enable = true; - environment.systemPackages = with unstablePkgs; [ - # custom - pkgs.overlays.yabai - #unfree -# slack -# spotify -# corefonts -# symbola - #gui - alacritty - vscodium - tdesktop - # terminal - # - vim - neovim - helix - # --- - wget - htop - bat - gitAndTools.gitFull - lazygit - git-lfs - lsd - lsof - tmux - tmate - curlFull - ripgrep - ranger - minio - minio-client - zip - unzip - jq - vifm - nnn - # neovim asks for a c compiler just to run nvim-treesitter commands. let's see - fzf - killall - tree - deluge - ncdu - edir - bottom - pigz - rclone - # direnv - direnv - nix-direnv - # scraping - python310Packages.yt-dlp - # code - nodejs - node2nix - zig - gcc - gnumake - sqlite - ]; -} - diff --git a/hosts/mac/mac.nix b/hosts/mac/mac.nix index dba3035..651e2e4 100644 --- a/hosts/mac/mac.nix +++ b/hosts/mac/mac.nix @@ -1,12 +1,29 @@ { pkgs, ... }: { - fonts.fontDir.enable = true; - fonts.fonts = with pkgs; [ +# custom +# y.kmonad.enable = true; + environment.systemPackages = with pkgs;[ + alacritty + #overlays.yabai + ]; + fonts.packages = with pkgs; [ recursive - (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) + pkgs.nerd-fonts.droid-sans-mono + # (pkgs.nerd-fonts.override { fonts = [ "JetBrainsMono" ]; }) ]; + #system.configurationRevision = self.rev or self.dirtyRev or null; system.keyboard = { enableKeyMapping = true; remapCapsLockToEscape = true; }; + #pkgs = import nixpkgs { + # overlays = builtins.attrValues self.overlays; + # system = "aarch64-darwin"; + #}; + nixpkgs.hostPlatform = "aarch64-darwin"; + system.stateVersion = 6; + ids.gids.nixbld = 30000; + #services.nix-daemon.enable = true; + + } diff --git a/hosts/pkgs.nix b/hosts/pkgs.nix index 953b7fd..2f55c40 100644 --- a/hosts/pkgs.nix +++ b/hosts/pkgs.nix @@ -1,87 +1,100 @@ { inputs, pkgs, + lib, ... }: { environment.systemPackages = with pkgs; [ - moreutils - alejandra - # nixfmt - # - busybox - usbutils - xdg-utils - rlwrap - wget - htop - btop - bat - gitAndTools.gitFull - lazygit - git-lfs - lsd - lsof - tmux - socat - tmate - curlFull - ripgrep - ranger - minio - minio-client - zip - unzip - jq - vifm - nnn - fzf - killall - tree - qrcp - deluge - ncdu - edir - bottom - pigz - rclone - gparted - autossh - #hardware problems - lm_sensors - linuxKernel.packages.linux_hardened.cpupower - # linuxKernel.packages.linux_latest_libre.cpupower + # networking + minio + minio-client + curlFull + wget + deluge + autossh + sshfs + # terminal basics + + htop + rlwrap + bat + gitAndTools.gitFull + lazygit + git-lfs + lsd + lsof + tmux + tmate + jq + vifm + killall + tree + qrcp + edir + bottom + pigz + rclone + # files/disk + nnn + ranger + ripgrep + fzf + ncdu + zip + unzip + # images imagemagick - sxiv - # audio debug - alsa-firmware - # wine - #wineWowPackages.staging - #wineWowPackages.waylandFull - appimage-run - # code + # nix nil + alejandra + #nixfmt direnv nix-direnv - # devenv - inputs.devenv.packages.${pkgs.system}.default + devenv + #inputs.devenv.packages.${pkgs.system}.default # scraping python312Packages.yt-dlp # markdown lsp marksman # disk automount - udiskie #crypto # electrum # yacreader - nethogs superhtml - sshfs - sxiv # ai stuff! # aider-chat - yek + # yek # python312Packages.google-generativeai + ] ++ lib.optionals pkgs.stdenv.isLinux [ + # linuxKernel.packages.linux_latest_libre.cpupower + gparted + moreutils + busybox + usbutils + xdg-utils + #hardware problems + lm_sensors + linuxKernel.packages.linux_hardened.cpupower + nethogs + #networking + # images + sxiv + # audio debug + alsa-firmware + # wine + appimage-run + # disk automount + udiskie + # /mac + ] ++ lib.optionals pkgs.stdenv.isDarwin [ + # mostly for mcp stuff + nodejs + node2nix + zig + gcc + gnumake + bun ]; } diff --git a/hosts/users.nix b/hosts/users.nix index 3572fbc..a32407c 100644 --- a/hosts/users.nix +++ b/hosts/users.nix @@ -1,6 +1,7 @@ { config, pkgs, + lib, ... }: let shellAliases = { @@ -33,9 +34,14 @@ in { users = { users = { y = { - group = "users"; + createHome = true; + home = "/home/y"; + shell = pkgs.fish; + } // (if !pkgs.stdenv.isDarwin then { + isSystemUser = false; isNormalUser = true; - extraGroups = [ + group = "users"; + extraGroups = (!pkgs.stdenv.isDarwin) [ "systemd-journal" "wheel" "networkmanager" @@ -46,11 +52,9 @@ in { "uinput" "jellyfin" ]; - createHome = true; - home = "/home/y"; - isSystemUser = false; - shell = pkgs.fish; - }; + } else {}); }; }; } + + |