ahoneybun/nix-configs
1
0
Fork 0
mirror of https://gitlab.com/ahoneybun/nix-configs.git synced 2025-05-12 11:14:02 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'rust-rewrite' into 'main'

Browse source 
Rust rewrite

See merge request ahoneybun/nix-configs!8
This commit is contained in:
Aaron Honeycutt 2025-04-22 12:30:16 -06:00
commit 698e2fc267
4 changed files with 5 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

7
configuration.nix
View file

@ -124,13 +124,6 @@
services.hardware.bolt.enable = true; services.hardware.bolt.enable = true;
system.activationScripts.diff = {
supportsDryActivation = true;
text = ''
${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig"
'';
};
# System # System
system.stateVersion = "24.11"; system.stateVersion = "24.11";
system.autoUpgrade.enable = true; system.autoUpgrade.enable = true;

29
flake.nix
View file

@ -4,31 +4,24 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/release-24.11"; nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
#nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; #nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
disko = {
url = github:nix-community/disko/latest;
inputs.nixpkgs.follows = "nixpkgs";
};
nixos-cosmic = { nixos-cosmic = {
url = "github:lilyinstarlight/nixos-cosmic"; url = "github:lilyinstarlight/nixos-cosmic";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
pinix.url = "github:remi-dupre/pinix"; pinix.url = "github:remi-dupre/pinix";
}; };
outputs = inputs@{ self, nixpkgs, disko, nixos-cosmic, home-manager, nixos-hardware, pinix, ... }: { outputs = inputs@{ self, nixpkgs, nixos-cosmic, home-manager, nixos-hardware, pinix, ... }: {
nixosConfigurations = { nixosConfigurations = {
"nixos" = nixpkgs.lib.nixosSystem { "nixos" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
# Add Disko for disk management
disko.nixosModules.disko
./disko-config.nix
./gnome.nix ./gnome.nix
./configuration.nix ./configuration.nix
./hardware-configuration.nix ./hardware-configuration.nix
@ -39,9 +32,6 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
# Add Disko for disk management
disko.nixosModules.disko
./disko-config.nix
./gnome.nix ./gnome.nix
./shepard.nix ./shepard.nix
./configuration.nix ./configuration.nix
@ -59,9 +49,6 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
# Add Disko for disk management
disko.nixosModules.disko
./disko-config.nix
./edi.nix ./edi.nix
./configuration.nix ./configuration.nix
./hardware-configuration.nix ./hardware-configuration.nix
@ -72,9 +59,6 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
# Add Disko for disk management
disko.nixosModules.disko
./disko-config.nix
./garrus.nix ./garrus.nix
./gnome.nix ./gnome.nix
./configuration.nix ./configuration.nix
@ -99,9 +83,6 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
# Add Disko for disk management
disko.nixosModules.disko
./disko-config.nix
./pixel-slate.nix ./pixel-slate.nix
./configuration.nix ./configuration.nix
]; ];
@ -111,9 +92,6 @@
system = "aarch64-linux"; system = "aarch64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
# Add Disko for disk management
disko.nixosModules.disko
./disko-config.nix
./drack.nix ./drack.nix
./gnome.nix ./gnome.nix
./configuration.nix ./configuration.nix
@ -129,9 +107,6 @@
"vm" = nixpkgs.lib.nixosSystem { "vm" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
# Add Disko for disk management
disko.nixosModules.disko
./disko-config.nix
./vm.nix ./vm.nix
./configuration.nix ./configuration.nix
./hardware-configuration.nix ./hardware-configuration.nix

1
home.nix
View file

@ -20,6 +20,7 @@
deja-dup deja-dup
libreoffice-fresh libreoffice-fresh
signal-desktop signal-desktop
]; ];
programs.bash = { programs.bash = {

4
hosts/x86_64/garrus/configuration.nix
View file

@ -1,9 +1,9 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
# lemp13 needs newer than the 6.6 # Latest kernel needed for best support
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
# Name your host machine # Name your host machine
networking.hostName = "garrus"; networking.hostName = "garrus";