From ea90e55cbbf771f90a20293f20db346ede27533c Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sun, 3 Nov 2024 22:44:23 -0500 Subject: [PATCH] compatibility modifications for sephiroth --- flake.lock | 35 +++--------- flake.nix | 9 ++- home/core.nix | 63 --------------------- home/default.nix | 4 +- home/packages/common.nix | 2 - home/packages/darwin.nix | 1 - home/packages/linux.nix | 1 + modules/common/host-users.nix | 2 - modules/common/nix-core.nix | 10 ++-- modules/machine/README.md | 6 +- modules/machine/cloud/configuration.nix | 9 ++- modules/machine/sephiroth/apps.nix | 5 +- modules/machine/sephiroth/configuration.nix | 15 +++-- 13 files changed, 45 insertions(+), 117 deletions(-) delete mode 100644 home/core.nix diff --git a/flake.lock b/flake.lock index 50051a5..087431b 100644 --- a/flake.lock +++ b/flake.lock @@ -3,19 +3,20 @@ "darwin": { "inputs": { "nixpkgs": [ - "nixpkgs-darwin" + "nixpkgs" ] }, "locked": { - "lastModified": 1725628909, - "narHash": "sha256-xI0OSqPHcs/c/utJsU0Zvcp1VhejMI9mgwr68uHHlPs=", + "lastModified": 1730448474, + "narHash": "sha256-qE/cYKBhzxHMtKtLK3hlSR3uzO1pWPGLrBuQK7r0CHc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "76559183801030451e200c90a1627c1d82bb4910", + "rev": "683d0c4cd1102dcccfa3f835565378c7f3cbe05e", "type": "github" }, "original": { "owner": "lnl7", + "ref": "master", "repo": "nix-darwin", "type": "github" } @@ -27,16 +28,15 @@ ] }, "locked": { - "lastModified": 1725703823, - "narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", + "lastModified": 1730490306, + "narHash": "sha256-AvCVDswOUM9D368HxYD25RsSKp+5o0L0/JHADjLoD38=", "owner": "nix-community", "repo": "home-manager", - "rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", + "rev": "1743615b61c7285976f85b303a36cdf88a556503", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -91,22 +91,6 @@ "type": "github" } }, - "nixpkgs-darwin": { - "locked": { - "lastModified": 1725784148, - "narHash": "sha256-kZQbAtu+HSIU186Y4sXL+YJNnVpAo6sb+qowxv8MwaQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "075d83b556ad70f12f82bbd54eb019f5657dd371", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-24.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1726243404, @@ -129,8 +113,7 @@ "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nix-ld": "nix-ld", - "nixpkgs": "nixpkgs_2", - "nixpkgs-darwin": "nixpkgs-darwin" + "nixpkgs": "nixpkgs_2" } } }, diff --git a/flake.nix b/flake.nix index 02bac2b..88b90ce 100644 --- a/flake.nix +++ b/flake.nix @@ -3,15 +3,14 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; - nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-24.05-darwin"; nix-ld.url = "github:Mic92/nix-ld"; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; darwin = { - url = "github:lnl7/nix-darwin"; - inputs.nixpkgs.follows = "nixpkgs-darwin"; + url = "github:lnl7/nix-darwin/master"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -27,7 +26,7 @@ userName = "wyatt"; userEmail = "wyatt@wyattjmiller.com"; extraSpecialArgs = { - inherit userName userEmail ; + inherit userName userEmail; }; in { # Primary laptop - MacBook Pro (2023, M3) diff --git a/home/core.nix b/home/core.nix deleted file mode 100644 index 9cfbd15..0000000 --- a/home/core.nix +++ /dev/null @@ -1,63 +0,0 @@ -{pkgs, ...}: { - home.packages = with pkgs; [ - nnn # terminal file manager - - # archives - zip - xz - unzip - p7zip - - # utils - zellij - tmux - bat - lazygit - bottom - ripgrep - jq - yq-go - fzf - fh - aria2 - yt-dlp - imv - xdg-utils - - # misc - cowsay - file - which - tree - gnutar - gnupg - nerdfonts - zoxide - babelfish - - # language-specific package managers - nodejs - cargo - python3 - - # nix specific stuff - nixd - deadnix - alejandra - statix - - # productivity - # iterm2 - discord - betterdiscordctl - vesktop - obsidian - vscode - weechat - # iamb - # ollama - - # games? - # prismlauncher - ]; -} diff --git a/home/default.nix b/home/default.nix index b9fc959..84f605a 100644 --- a/home/default.nix +++ b/home/default.nix @@ -15,7 +15,7 @@ in { imports = map (module: import module {inherit lib pkgs dirs userName userEmail;}) [ ./atuin.nix ./shell.nix - ./core.nix + ./packages ./git.nix ./starship.nix ./eza.nix @@ -43,7 +43,7 @@ in { XDG_STATE_HOME = "$HOME/.local/state"; }; - pointerCursor = { + pointerCursor = lib.mkIf pkgs.stdenv.isLinux { gtk.enable = true; package = pkgs.catppuccin-cursors.mochaDark; name = "catppuccin-mocha-dark-cursors"; diff --git a/home/packages/common.nix b/home/packages/common.nix index 43cc268..ea7a501 100644 --- a/home/packages/common.nix +++ b/home/packages/common.nix @@ -21,8 +21,6 @@ fh aria2 yt-dlp - imv - xdg-utils obsidian vscode weechat diff --git a/home/packages/darwin.nix b/home/packages/darwin.nix index 19e825b..4306b58 100644 --- a/home/packages/darwin.nix +++ b/home/packages/darwin.nix @@ -4,7 +4,6 @@ ... }: { home.packages = lib.mkIf pkgs.stdenv.isDarwin (with pkgs; [ - iterm2 discord ollama ]); diff --git a/home/packages/linux.nix b/home/packages/linux.nix index 3208b8e..af40187 100644 --- a/home/packages/linux.nix +++ b/home/packages/linux.nix @@ -7,5 +7,6 @@ imv betterdiscordctl vesktop + xdg-utils ]); } diff --git a/modules/common/host-users.nix b/modules/common/host-users.nix index 0878644..4d8d4df 100644 --- a/modules/common/host-users.nix +++ b/modules/common/host-users.nix @@ -21,8 +21,6 @@ then "/Users/${userName}" else "/home/${userName}"; description = userName; - group = "wyatt"; - isNormalUser = true; }; users.groups.wyatt = {}; diff --git a/modules/common/nix-core.nix b/modules/common/nix-core.nix index 12fb051..7cf35df 100644 --- a/modules/common/nix-core.nix +++ b/modules/common/nix-core.nix @@ -1,9 +1,10 @@ - -{ pkgs, lib, ... }: - { + pkgs, + lib, + ... +}: { # enable flakes globally - nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix.settings.experimental-features = ["nix-command" "flakes"]; # Allow unfree packages nixpkgs.config.allowUnfree = true; @@ -13,6 +14,7 @@ # Use this instead of services.nix-daemon.enable if you # don't wan't the daemon service to be managed for you. # nix.useDaemon = true; + services.nix-daemon.enable = true; nix.package = pkgs.nix; diff --git a/modules/machine/README.md b/modules/machine/README.md index e8a01a1..66b8967 100644 --- a/modules/machine/README.md +++ b/modules/machine/README.md @@ -4,10 +4,12 @@ These are where the machine specific configurations live. I like Final Fantasy, alright? Isn't everyone supposed to have a hobby? -## Desktops, Laptops, and Workstations +## Naming schemes + +### Desktops, Laptops, and Workstations These are named after Final Fantasy VII characters. -## Servers/Network Infrastructure +### Servers/Network Infrastructure These are named after Final Fantasy summons. diff --git a/modules/machine/cloud/configuration.nix b/modules/machine/cloud/configuration.nix index 95fb6e2..dd59431 100644 --- a/modules/machine/cloud/configuration.nix +++ b/modules/machine/cloud/configuration.nix @@ -155,8 +155,8 @@ # Firewall stuff not allowed in common user and network creation networking.firewall.enable = true; # VERY important, do not touch - # networking.firewall.allowedTCPPorts = []; - # networking.firewall.allowedUDPPorts = []; + networking.firewall.allowedTCPPorts = []; + networking.firewall.allowedUDPPorts = []; networking.networkmanager.enable = true; # Linux tool for managing network connections # Enable Flatpak (app containerization) @@ -200,5 +200,10 @@ arguments = "-v -o pw"; }; + users.users."${userName}" = { + group = "${userName}"; + isNormalUser = true; + }; + system.stateVersion = "24.05"; } diff --git a/modules/machine/sephiroth/apps.nix b/modules/machine/sephiroth/apps.nix index 4ccbd86..6cfb65e 100644 --- a/modules/machine/sephiroth/apps.nix +++ b/modules/machine/sephiroth/apps.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: { - +{pkgs, ...}: { environment.systemPackages = with pkgs; [ neovim git @@ -19,7 +18,7 @@ # Applications to install from Mac App Store using mas. # You need to install all these Apps manually first so that your apple account have records for them. # otherwise Apple Store will refuse to install them. - # For details, see https://github.com/mas-cli/mas + # For details, see https://github.com/mas-cli/mas masApps = { Xcode = 497799835; "Reeder 5." = 1529448980; diff --git a/modules/machine/sephiroth/configuration.nix b/modules/machine/sephiroth/configuration.nix index cce0ded..ec82bb5 100644 --- a/modules/machine/sephiroth/configuration.nix +++ b/modules/machine/sephiroth/configuration.nix @@ -1,4 +1,8 @@ -{pkgs, hostname, ...}: { +{ + pkgs, + hostname, + ... +}: { system = { # activationScripts are executed every time you boot the system or run `nixos-rebuild` / `darwin-rebuild`. activationScripts.postUserActivation.text = '' @@ -145,12 +149,11 @@ # }; }; - networking.hostName = hostname; networking.computerName = hostname; - networking.firewall.enable = true; # VERY important, do not touch - networking.firewall.allowedTCPPorts = []; - networking.firewall.allowedUDPPorts = []; + # networking.firewall.enable = true; # VERY important, do not touch + # networking.firewall.allowedTCPPorts = []; + # networking.firewall.allowedUDPPorts = []; system.defaults.smb.NetBIOSName = hostname; # Add ability to used TouchID for sudo authentication @@ -165,6 +168,8 @@ pkgs.bash ]; + system.stateVersion = 5; + # Set your time zone. time.timeZone = "America/Detroit"; }