ringofstorms/dotfiles
ringofstorms/dotfiles
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update systems, nvtop only on desktop

Browse source
This commit is contained in:
ringofstorms 2024-04-24 11:09:29 -05:00
parent e5b7ad50ad
commit 972856acee
9 changed files with 56 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

38
flake.lock generated
View file

@ -3,7 +3,7 @@
"agenix": {
"inputs": {
"darwin": "darwin",
"home-manager": "home-manager",
"home-manager": "home-manager_2",
"nixpkgs": [
"ragenix",
"nixpkgs"
@ -87,6 +87,27 @@
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1713906585,
"narHash": "sha256-fv84DCOkBtjF6wMATt0rfovu7e95L8rdEkSfNbwKR3U=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "bfa7c06436771e3a0c666ccc6ee01e815d4c33aa",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_2": {
"inputs": {
"nixpkgs": [
"ragenix",
@ -110,16 +131,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1711668574,
"narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
"lastModified": 1713714899,
"narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
"rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.11",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
@ -131,11 +152,11 @@
]
},
"locked": {
"lastModified": 1711646165,
"narHash": "sha256-Df/834E2M5Qc+jKb/LqraoPjjz1k1oCoL5PQB/1aT44=",
"lastModified": 1713095112,
"narHash": "sha256-Q+6nVJqyKnEeXKq9h1glCZ+HeML4ZdnPBfmg8U99d54=",
"owner": "yunfachi",
"repo": "nypkgs",
"rev": "a99e5f398dc27ee06a3a57c88b65a6869f426795",
"rev": "4afb31c3ea03c83d37e0182015cf80a5cb487be4",
"type": "github"
},
"original": {
@ -170,6 +191,7 @@
},
"root": {
"inputs": {
"home-manager": "home-manager",
"nixpkgs": "nixpkgs",
"nypkgs": "nypkgs",
"ragenix": "ragenix"

13
flake.nix
View file

@ -14,11 +14,16 @@
inputs.nixpkgs.follows = "nixpkgs";
};
# Pinned nix version
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-23.11";
home-manager = {
url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows =
"nixpkgs"; # Use system packages list where available
};
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
};
outputs = { self, nypkgs, nixpkgs, ... } @ inputs:
outputs = { self, nypkgs, nixpkgs, home-manager, ... } @ inputs:
let
myHosts = [
{
@ -68,7 +73,7 @@
acc // {
"${nixConfig.name}" = nixpkgs.lib.nixosSystem
{
modules = [ ./hosts/_common/configuration.nix ./hosts/${nixConfig.name}/configuration.nix ];
modules = [./hosts/_common/configuration.nix ./hosts/${nixConfig.name}/configuration.nix ];
specialArgs = inputs // {
ylib = nypkgs.legacyPackages.${nixConfig.opts.system}.lib;
settings = directories // nixConfig.settings // {

2
hosts/_common/components/caps_to_escape_in_tty.nix
View file

@ -1,7 +1,7 @@
{ pkgs, ... }:
{
# I want this globally even for root so doing it outside of home manager
services.xserver.xkbOptions = "caps:escape";
services.xserver.xkb.options = "caps:escape";
console = {
earlySetup = true;
packages = with pkgs; [ terminus_font ];

15
hosts/_common/components/home_manager.nix
View file

@ -1,16 +1,13 @@
{ config, pkgs, settings, ylib, ... } @ inputs:
let
home-manager = builtins.fetchTarball {
url = "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz";
# to get hash run `nix-prefetch-url --unpack "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz"`
sha256 = "0g51f2hz13dk953i501fmc6935difhz60741nypaqwz127hy5ldk";
};
in
{ config, pkgs, home-manager, settings, ylib, ... } @ inputs:
# Note that we must have the channel added for the import to work below
# `sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz home-manager`
# `sudo nix-channel --update`
{
imports =
[
# home manager import
(import "${home-manager}/nixos")
home-manager.nixosModules.home-manager
# home-manager
];
# Home manager options
security.polkit.enable = true;

1
hosts/_common/configuration.nix
View file

@ -48,7 +48,6 @@ in
neofetch
bat
htop
nvtop
unzip
git
fzf

2
hosts/joe/configuration.nix
View file

@ -30,7 +30,7 @@
hardware.pulseaudio.enable = true;
hardware.pulseaudio.package = pkgs.pulseaudioFull;
# environment.systemPackages = with pkgs; [ ];
environment.systemPackages = with pkgs; [ nvtopPackages.full ];
# nvidia gfx https://nixos.wiki/wiki/Nvidia
# =========

3
readme.md
View file

@ -15,6 +15,9 @@
-- TODO come up with a way to pregen keys so onboarding is less stupid with secrets?
- add home home-manager
- `sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz home-manager`
- `sudo nix-channel --update`
- `cp -r /etc/nixos ~/nixos_bak` Backup configuration
- Checkout this repo into /etc/nixos: `rm -rf /etc/nixos` `git clone https://github.com/ringofstorms/dotfiles /etc/nixos`
- Copy the backup into the new /etc/nixos/hosts/HOSTNAME dir `mkdir /etc/nixos/hosts/HOSTNAME && cp -r ~/nixos_bak/* /etx/nixos/hosts/HOSTNAME`

5
users/josh/by_hosts/joe/home_manager/spotify.nix Normal file
View file

@ -0,0 +1,5 @@
{ pkgs, ... }:
{
home.packages = [ pkgs.spotify ];
}

2
users/josh/home_manager/zsh.nix
View file

@ -2,7 +2,7 @@
{
programs.zsh = {
enable = true;
enableAutosuggestions = true;
autosuggestion.enable = true;
shellAliases = { };