jsutter/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

working i think

Browse source
This commit is contained in:
Julian Sutter 2024-04-07 23:06:52 -07:00
parent 64e1442ee3
commit f3b4eb3ca3
3 changed files with 5 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

16
flake.lock generated Executable file → Normal file
View file

@ -7,19 +7,11 @@
] ]
}, },
"locked": { "locked": {
<<<<<<< HEAD
"lastModified": 1711133180,
"narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
=======
"lastModified": 1712462372, "lastModified": 1712462372,
"narHash": "sha256-WA3bbBWhd3o1wAgyHZNypjb/LG4oq+IWxFq8ey8yNPU=", "narHash": "sha256-WA3bbBWhd3o1wAgyHZNypjb/LG4oq+IWxFq8ey8yNPU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a561ad6ab38578c812cc9af3b04f2cc60ebf48c9", "rev": "a561ad6ab38578c812cc9af3b04f2cc60ebf48c9",
>>>>>>> b91a29b (plasma6)
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -30,19 +22,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
<<<<<<< HEAD
"lastModified": 1711163522,
"narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
=======
"lastModified": 1712439257, "lastModified": 1712439257,
"narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
>>>>>>> b91a29b (plasma6)
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View file

@ -44,9 +44,9 @@
modules = [ modules = [
./systems/common.nix ./systems/common.nix
./systems/labby.nix ./systems/labby.nix
# ./users/jsutter.nix ./users/jsutter.nix
# ./users/isutter.nix ./users/isutter.nix
# ./users/aksutter.nix ./users/aksutter.nix
./modules/plasma.nix ./modules/plasma.nix
# ./modules/3dprinting.nix # ./modules/3dprinting.nix
]; ];

7
systems/common.nix
View file

@ -55,10 +55,7 @@
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
# nixpkgs.config.nvidia.acceptLicense = true; # nixpkgs.config.nvidia.acceptLicense = true;
# nixpkgs.config.nvidia.libsOnly = false; # nixpkgs.config.nvidia.libsOnly = false;
<<<<<<< HEAD nixpkgs.config.allowBroken = true;
=======
# nixpkgs.config.allowBroken = true;
>>>>>>> b91a29b (plasma6)
# Location & internationalisation # Location & internationalisation
time.timeZone = "America/Los_Angeles"; time.timeZone = "America/Los_Angeles";
@ -128,7 +125,7 @@
kopia kopia
]; ];
# services.flatpak.enable = true; services.flatpak.enable = true;
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
nerdfonts nerdfonts