jacob/nix_config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update to 2024.11-pre

Browse Source
This commit is contained in:
Jacob Hinkle 2024-09-05 08:25:56 -04:00
parent bd15f1ea02
commit 76016688a4
5 changed files with 49 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
flake.lock generated
View File

@ -7,27 +7,27 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1699368917, "lastModified": 1725180166,
"narHash": "sha256-nUtGIWf86BOkUbtksWtfglvCZ/otP0FTZlQH8Rzc7PA=", "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6a8444467c83c961e2f5ff64fb4f422e303c98d3", "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6a8444467c83c961e2f5ff64fb4f422e303c98d3", "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
"type": "github" "type": "github"
} }
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1711352745, "lastModified": 1725477728,
"narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=", "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0", "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -38,31 +38,31 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1701282334, "lastModified": 1716394534,
"narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=", "narHash": "sha256-R5cP4FbP/YLhkE2B1omXTZEUTOZG0tjCe4/n/yz+LwQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e", "rev": "4a817d2083d6cd7068dc55511fbf90f84653b301",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "23.11", "ref": "24.11-pre",
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1711233294, "lastModified": 1721524707,
"narHash": "sha256-eEu5y4J145BYDw9o/YEmeJyqh8blgnZwuz9k234zuWc=", "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ac6bdf6181666ebb4f90dd20f31e2fa66ede6b68", "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-23.11", "ref": "release-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -83,11 +83,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1711249319, "lastModified": 1725201042,
"narHash": "sha256-N+Pp3/8H+rd7cO71VNV/ovV/Kwt+XNeUHNhsmyTabdM=", "narHash": "sha256-lj5pxOwidP0W//E7IvyhbhXrnEUW99I07+QpERnzTS4=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "405987a66cce9a4a82f321f11b205982a7127c88", "rev": "5db5921e40ae382d6716dce591ea23b0a39d96f7",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View File

@ -2,13 +2,13 @@
description = "NixOS configurations for my machines"; description = "NixOS configurations for my machines";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/23.11"; nixpkgs.url = "nixpkgs/24.11-pre";
nixos-hardware = { nixos-hardware = {
url = github:nixos/nixos-hardware; url = github:nixos/nixos-hardware;
}; };
home-manager = { home-manager = {
# url = github:nix-community/home-manager; # url = github:nix-community/home-manager;
url = github:nix-community/home-manager/6a8444467c83c961e2f5ff64fb4f422e303c98d3; url = github:nix-community/home-manager/471e3eb0a114265bcd62d11d58ba8d3421ee68eb;
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
sops-nix = { sops-nix = {
@ -59,7 +59,7 @@
]; ];
# ThinkCentre M700 mini-pc (server) # ThinkCentre M700 mini-pc (server)
cj = mkNixosSystem [ cj = mkNixosSystem [
nixos-hardware.nixosModules.common-pc-hdd #nixos-hardware.nixosModules.common-pc-hdd
nixos-hardware.nixosModules.common-cpu-intel-cpu-only nixos-hardware.nixosModules.common-cpu-intel-cpu-only
./machines/cj/configuration.nix ./machines/cj/configuration.nix
]; ];

11
home/jacob.nix
View File

@ -56,7 +56,7 @@
sops sops
speedcrunch speedcrunch
spotify spotify
spotify-tui #spotify-tui # this has been removed as of 2024.05
sxiv sxiv
#texlive.combined.scheme-full #texlive.combined.scheme-full
tree tree
@ -153,11 +153,7 @@
}; };
firefox = { firefox = {
enable = true; enable = true;
package = pkgs.firefox.override { #nativeMessagingHosts.packages = [ pkgs.tridactyl-native ];
cfg = {
enableTridactylNative = true;
};
};
}; };
git = { git = {
enable = true; enable = true;
@ -261,9 +257,6 @@
"--fx ''" # don't apply effects "--fx ''" # don't apply effects
]; ];
}; };
dunst = {
enable = true;
};
flameshot.enable = true; flameshot.enable = true;
mbsync = { mbsync = {
enable = true; enable = true;

33
machines/cj/configuration.nix
View File

@ -211,20 +211,14 @@
# Enable the X11 windowing system. # Enable the X11 windowing system.
xserver = { xserver = {
enable = true; enable = true;
dpi = 180;
displayManager = { displayManager = {
defaultSession = "none+i3";
autoLogin = {
enable = true;
user = "jacob";
};
lightdm = { lightdm = {
enable = true; enable = true;
greeter.enable = false; greeter.enable = false;
}; };
}; };
layout = "us"; dpi = 180;
libinput.enable = true; xkb.layout = "us";
windowManager.i3 = { windowManager.i3 = {
enable = true; enable = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
@ -236,6 +230,15 @@
}; };
}; };
libinput.enable = true;
displayManager = {
defaultSession = "none+i3";
autoLogin = {
enable = true;
user = "jacob";
};
};
# ZFS services # ZFS services
zfs = { zfs = {
trim.enable = true; trim.enable = true;
@ -251,6 +254,20 @@
}; };
}; };
power.ups = {
enable = false;
mode = "netserver";
ups."myups" = {
driver = "usbhid-ups";
description = "CJ UPS";
port = "auto";
};
};
#environment.etc."nut/upsd.conf".source = ./config/upsd.conf;
#environment.etc."nut/upsd.users".source = ./config/upsd.users;
#environment.etc."nut/upsmon.conf".source = ./config/upsmon.conf;
# Due to bug in home assistant, this workaround is suggested temporarily as of May 6, 2022 # Due to bug in home assistant, this workaround is suggested temporarily as of May 6, 2022
# https://github.com/nix-community/home-manager/issues/2942#issuecomment-1119760100 # https://github.com/nix-community/home-manager/issues/2942#issuecomment-1119760100
#nixpkgs.config.allowUnfree = true; #nixpkgs.config.allowUnfree = true;

2
machines/cj/pihole.nix
View File

@ -1,5 +1,5 @@
{ serverIP, serverIP6 } : { { serverIP, serverIP6 } : {
image = "pihole/pihole:2024.01.0"; image = "pihole/pihole:2024.07.0";
ports = [ ports = [
"53:53/tcp" "53:53/tcp"
"53:53/udp" "53:53/udp"