wymiller/nix-config-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compatibility modifications for sephiroth

Browse Source
This commit is contained in:
Wyatt J. Miller 2024-11-03 22:44:23 -05:00
parent 9a435da5e3
commit ea90e55cbb
13 changed files with 45 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
flake.lock
View File

@ -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"
}
}
},

7
flake.nix
View File

@ -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";
};
};

63
home/core.nix
View File

@ -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
];
}

4
home/default.nix
View File

@ -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";

2
home/packages/common.nix
View File

@ -21,8 +21,6 @@
fh
aria2
yt-dlp
imv
xdg-utils
obsidian
vscode
weechat

1
home/packages/darwin.nix
View File

@ -4,7 +4,6 @@
...
}: {
home.packages = lib.mkIf pkgs.stdenv.isDarwin (with pkgs; [
iterm2
discord
ollama
]);

1
home/packages/linux.nix
View File

@ -7,5 +7,6 @@
imv
betterdiscordctl
vesktop
xdg-utils
]);
}

2
modules/common/host-users.nix
View File

@ -21,8 +21,6 @@
then "/Users/${userName}"
else "/home/${userName}";
description = userName;
group = "wyatt";
isNormalUser = true;
};
users.groups.wyatt = {};

8
modules/common/nix-core.nix
View File

@ -1,7 +1,8 @@
{ pkgs, lib, ... }:
{
pkgs,
lib,
...
}: {
# enable flakes globally
nix.settings.experimental-features = ["nix-command" "flakes"];
@ -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;

6
modules/machine/README.md
View File

@ -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.

9
modules/machine/cloud/configuration.nix
View File

@ -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";
}

1
modules/machine/sephiroth/apps.nix
View File

@ -1,5 +1,4 @@
{pkgs, ...}: {
environment.systemPackages = with pkgs; [
neovim
git

15
modules/machine/sephiroth/configuration.nix
View File

@ -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";
}