Toast/nix-stuff
1
0
Fork 0
Code Issues Pull requests Projects 1 Wiki Activity

Compare commits

base: Toast:bda9abff87c1c5333e5a38704c3d510618bd5290
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05
..
compare: Toast:ea0d7caf4f16f2621a7c91333baafdf6d7189a0a
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05

No commits in common. "bda9abff87c1c5333e5a38704c3d510618bd5290" and "ea0d7caf4f16f2621a7c91333baafdf6d7189a0a" have entirely different histories.
bda9abff87 ... ea0d7caf4f

5 changed files with 33 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

48
flake.lock generated
View file

@ -25,11 +25,11 @@
}, },
"catppuccin": { "catppuccin": {
"locked": { "locked": {
"lastModified": 1712890104, "lastModified": 1712482981,
"narHash": "sha256-56RS7wdJ2QDUNCQt/9lx8MFcwuTdVQnzBV+9QToLLmM=", "narHash": "sha256-LJOOpTey9Y29C/TK4h9KP7v4HvqDL3mLyT9hSWCfFlI=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "850c26a3a2474b0d068abc89c905f536cca415de", "rev": "4043beb6c792a40e9c513aa261f4ba10601a4457",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -120,11 +120,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712759992, "lastModified": 1712462372,
"narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=", "narHash": "sha256-WA3bbBWhd3o1wAgyHZNypjb/LG4oq+IWxFq8ey8yNPU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9", "rev": "a561ad6ab38578c812cc9af3b04f2cc60ebf48c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -162,11 +162,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712909442, "lastModified": 1712521891,
"narHash": "sha256-D+VrmsPLkEbxNcI7lp9rGFR33RumbQIyhhjJ4PooWBs=", "narHash": "sha256-qJRkB7QZo2mdR/nABeHQKi3xkQxUsSGjVVQXTSHQocI=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "8886e3da78fcefb11935ea85da3d1572bf444c55", "rev": "ec53086c76303dc8880fa7ba06c45abcae8b3398",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -270,11 +270,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1712760404, "lastModified": 1712566108,
"narHash": "sha256-4zhaEW1nB+nGbCNMjOggWeY5nXs/H0Y71q0+h+jdxoU=", "narHash": "sha256-c9nT2ZODGqobISP41kUwCQ84Srwg7a/1TmPFQuol2/8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "e1c4bac14beb8c409d0534382cf967171706b9d9", "rev": "1e3b3a35b7083f4152f5a516798cf9b21e686465",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -286,11 +286,11 @@
}, },
"nixpkgs-raw": { "nixpkgs-raw": {
"locked": { "locked": {
"lastModified": 1712741485, "lastModified": 1712437997,
"narHash": "sha256-bCs0+MSTra80oXAsnM6Oq62WsirOIaijQ/BbUY59tR4=", "narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b2cf36f43f9ef2ded5711b30b1f393ac423d8f72", "rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -301,11 +301,11 @@
}, },
"nixpkgs-unstable-raw": { "nixpkgs-unstable-raw": {
"locked": { "locked": {
"lastModified": 1712791164, "lastModified": 1712439257,
"narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -316,11 +316,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1712906890, "lastModified": 1712605683,
"narHash": "sha256-MkhmSqGqQ5cDa1VzqkA76h6+9rYCY2IJzSRglNV+Vr4=", "narHash": "sha256-+ZnPwPchvPG+rOFfpxLjKm+5ZNRtYUBtn1KkEojgsSc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "0fb8bccadea16d13d87210c21fbae09b26c28e07", "rev": "1db8af43c9b75768461a01d84e17596e331df77f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -429,11 +429,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712884817, "lastModified": 1712580452,
"narHash": "sha256-zs8oMnWHg3g0P+3ZsEj69m9aZCrGa/bqZUHRV9sF0w0=", "narHash": "sha256-X1LjMY8wpnflD2nq7GuYxTichyWR9qxw8eGmzyEW4h8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "882c461b61050a266fe9bc8d93d342f24b54250f", "rev": "5041ca76d6c80d057673e5202fa4167f81202391",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
machines/SteamDeck/configuration.nix
View file

@ -45,7 +45,7 @@
enable = true; enable = true;
}; };
}; };
services.displayManager.sddm.enable = lib.mkForce false; services.xserver.displayManager.sddm.enable = lib.mkForce false;
# Enable bluetooth # Enable bluetooth
hardware.bluetooth = { hardware.bluetooth = {

4
machines/WinMax2/configuration.nix
View file

@ -69,8 +69,8 @@
# networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
services = { services.xserver = {
xserver.xkb.layout = lib.mkForce "us"; xkb.layout = lib.mkForce "us";
displayManager.sddm.settings = { displayManager.sddm.settings = {
General.GreeterEnvironment = "QT_SCREEN_SCALE_FACTORS=2"; General.GreeterEnvironment = "QT_SCREEN_SCALE_FACTORS=2";
}; };

8
roles/kde/plasma.nix
View file

@ -49,12 +49,10 @@
''; '';
}; };
in { in {
services = { services.xserver = {
# Enable the Plasma 5 Desktop Environment
desktopManager.plasma5.enable = true;
displayManager.defaultSession = "plasmawayland"; displayManager.defaultSession = "plasmawayland";
xserver = {
# Enable the Plasma 5 Desktop Environment
desktopManager.plasma5.enable = true;
};
}; };
qt.enable = true; qt.enable = true;

6
roles/kde/sddm.nix
View file

@ -3,7 +3,7 @@
pkgs, pkgs,
... ...
}: let }: let
currentTheme = config.services.displayManager.sddm.theme; currentTheme = config.services.xserver.displayManager.sddm.theme;
sddm-sugar-candy = pkgs.stdenv.mkDerivation { sddm-sugar-candy = pkgs.stdenv.mkDerivation {
pname = "sddm-sugar-candy"; pname = "sddm-sugar-candy";
@ -43,11 +43,11 @@
}; };
in { in {
# Enable SDDM. # Enable SDDM.
services.displayManager.sddm = { services.xserver.displayManager.sddm = {
enable = true; enable = true;
theme = "sugar-candy"; theme = "sugar-candy";
settings = { settings = {
General = {Numlock = "off";}; General = {Numlock = "on";};
Theme = {CursorTheme = "Breeze_Snow";}; Theme = {CursorTheme = "Breeze_Snow";};
}; };
}; };