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

plasma6

Browse source
This commit is contained in:
Julian Sutter 2024-04-07 23:01:57 -07:00
parent aa7a228f54
commit 64e1442ee3
5 changed files with 34 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
flake.lock generated
View file

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

10
flake.nix
View file

@ -36,7 +36,7 @@
./modules/virtualization.nix ./modules/virtualization.nix
./modules/office.nix ./modules/office.nix
./modules/gaming.nix ./modules/gaming.nix
./modules/3dprinting.nix # ./modules/3dprinting.nix
]; ];
}; };
labby = nixpkgs.lib.nixosSystem { labby = nixpkgs.lib.nixosSystem {
@ -44,11 +44,11 @@
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
]; ];
}; };
}; };

6
modules/plasma.nix
View file

@ -2,9 +2,9 @@
{ {
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.displayManager.sddm.enable = true; # services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true; services.desktopManager.plasma6.enable = true;
environment.plasma5.excludePackages = with pkgs.libsForQt5; [ environment.plasma6.excludePackages = with pkgs.kdePackages; [
khelpcenter khelpcenter
]; ];

12
systems/common.nix
View file

@ -55,6 +55,10 @@
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;
>>>>>>> b91a29b (plasma6)
# Location & internationalisation # Location & internationalisation
time.timeZone = "America/Los_Angeles"; time.timeZone = "America/Los_Angeles";
@ -106,9 +110,9 @@
gnupg gnupg
p7zip p7zip
rsync rsync
bumblebee # bumblebee
glxinfo # glxinfo
libgdiplus # libgdiplus
unzip unzip
clinfo clinfo
python3 python3
@ -124,7 +128,7 @@
kopia kopia
]; ];
services.flatpak.enable = true; # services.flatpak.enable = true;
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
nerdfonts nerdfonts

2
users/jsutter.nix
View file

@ -40,6 +40,8 @@ in
signal-desktop signal-desktop
putty putty
rpi-imager rpi-imager
discord
stremio
]; ];
}; };