aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Janzen <jacob.a.s.janzen@gmail.com>2024-09-26 17:07:07 -0500
committerJacob Janzen <jacob.a.s.janzen@gmail.com>2024-09-26 17:59:44 -0500
commit178ef69d9d606fe6c7500a328a822845e73a53b2 (patch)
tree584db695ccf7174a6c22436302648eaca5171d23
parent0027b29533c61023ca6df776c87f9c15df31f70e (diff)
add subdirectory?
-rw-r--r--nixos/.flake/flake.lock18
-rw-r--r--nixos/.flake/flake.nix18
-rw-r--r--nixos/.flake/home.nix2
-rw-r--r--nixos/.flake/system/core.nix (renamed from nixos/.flake/configuration.nix)1
-rw-r--r--nixos/.flake/system/hardware-configuration.nix (renamed from nixos/.flake/hardware-configuration.nix)0
5 files changed, 20 insertions, 19 deletions
diff --git a/nixos/.flake/flake.lock b/nixos/.flake/flake.lock
index d863b13..055d415 100644
--- a/nixos/.flake/flake.lock
+++ b/nixos/.flake/flake.lock
@@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1727246346,
- "narHash": "sha256-TcUaKtya339Asu+g6KTJ8h7KiKcKXKp2V+At+7tksyY=",
+ "lastModified": 1727383923,
+ "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "1e22ef1518fb175d762006f9cae7f6312b8caedb",
+ "rev": "ffe2d07e771580a005e675108212597e5b367d2d",
"type": "github"
},
"original": {
@@ -19,11 +19,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1726755586,
- "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
+ "lastModified": 1726937504,
+ "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
+ "rev": "9357f4f23713673f310988025d9dc261c20e70c6",
"type": "github"
},
"original": {
@@ -35,11 +35,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1726937504,
- "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
+ "lastModified": 1727122398,
+ "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "9357f4f23713673f310988025d9dc261c20e70c6",
+ "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
"type": "github"
},
"original": {
diff --git a/nixos/.flake/flake.nix b/nixos/.flake/flake.nix
index da41906..a8a2fea 100644
--- a/nixos/.flake/flake.nix
+++ b/nixos/.flake/flake.nix
@@ -5,9 +5,9 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
};
- outputs = {
+ outputs = {
self,
- nixpkgs,
+ nixpkgs,
home-manager,
...
}@inputs: {
@@ -15,14 +15,14 @@
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
- ./configuration.nix
+ ./system/core.nix
home-manager.nixosModules.home-manager
- {
- home-manager.backupFileExtension = "bak";
- home-manager.useGlobalPkgs = true;
- home-manager.useUserPackages = true;
- home-manager.users.jane = import ./home.nix;
- }
+ {
+ home-manager.backupFileExtension = "bak";
+ home-manager.useGlobalPkgs = true;
+ home-manager.useUserPackages = true;
+ home-manager.users.jane = import ./home.nix;
+ }
];
};
};
diff --git a/nixos/.flake/home.nix b/nixos/.flake/home.nix
index a8fd7ca..1f06c1b 100644
--- a/nixos/.flake/home.nix
+++ b/nixos/.flake/home.nix
@@ -11,6 +11,8 @@
fonts.fontconfig.enable = true;
home.packages = with pkgs; [
+ python3
+ texliveFull
obs-studio
prismlauncher
discord
diff --git a/nixos/.flake/configuration.nix b/nixos/.flake/system/core.nix
index 0999475..3747531 100644
--- a/nixos/.flake/configuration.nix
+++ b/nixos/.flake/system/core.nix
@@ -138,4 +138,3 @@
system.stateVersion = "24.05"; # Did you read the comment?
}
-
diff --git a/nixos/.flake/hardware-configuration.nix b/nixos/.flake/system/hardware-configuration.nix
index 74ef301..74ef301 100644
--- a/nixos/.flake/hardware-configuration.nix
+++ b/nixos/.flake/system/hardware-configuration.nix