Compare commits

...

4 Commits

7 changed files with 80 additions and 27 deletions

42
flake.lock generated
View File

@ -9,11 +9,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1689334118, "lastModified": 1690228878,
"narHash": "sha256-djk5AZv1yU84xlKFaVHqFWvH73U7kIRstXwUAnDJPsk=", "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "0d8c5325fc81daf00532e3e26c6752f7bcde1143", "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -72,11 +72,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1690084763, "lastModified": 1690303752,
"narHash": "sha256-Nw680m/pyVoosSgXZW415Z657mfVM2BxaxDPjEk48Z0=", "narHash": "sha256-2YiwFHQERGoaORNORmsdmVlPD8CVVwlwbV2+f77sFhg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "fb03fa5516d4e86059d24ab35a611ffa3a359547", "rev": "ba2c0737cc848db03470828fdb5e86df75ed42a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -88,11 +88,11 @@
"jovian-nixos": { "jovian-nixos": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1689533373, "lastModified": 1690158936,
"narHash": "sha256-/eTz8SCXRw2DTWM1AwRt7jA3FeZBVZIqmVze67TcBjg=", "narHash": "sha256-g1Fy+6fTV18n7i2IOjc8S2DidCgnW65gLgmPaJ1WmI8=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "8a934c6ebf10d0a153f0b62d933f7946e67f610f", "rev": "f64c5540ba8106a87dff9648db675a55e982fe9c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -104,11 +104,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1689320556, "lastModified": 1690200740,
"narHash": "sha256-vODUkZLWFVCvo1KPK3dC2CbXjxa9antEn5ozwlcTr48=", "narHash": "sha256-aRkEXGmCbAGcvDcdh/HB3YN+EvoPoxmJMOaqRZmf6vM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "d4ea64f2063820120c05f6ba93ee02e6d4671d6b", "rev": "ba9650b14e83b365fb9e731f7d7c803f22d2aecf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -120,11 +120,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1690031011, "lastModified": 1690179384,
"narHash": "sha256-kzK0P4Smt7CL53YCdZCBbt9uBFFhE0iNvCki20etAf4=", "narHash": "sha256-+arbgqFTAtoeKtepW9wCnA0njCOyoiDFyl0Q0SBSOtE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "12303c652b881435065a98729eb7278313041e49", "rev": "b12803b6d90e2e583429bb79b859ca53c348b39a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -136,11 +136,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1689956312, "lastModified": 1690148897,
"narHash": "sha256-NV9yamMhE5jgz+ZSM2IgXeYqOvmGIbIIJ+AFIhfD7Ek=", "narHash": "sha256-l/j/AX1d2K79EWslwgWR2+htkzCbtjKZsS5NbWXnhz4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nIxpkgs", "repo": "nIxpkgs",
"rev": "6da4bc6cb07cba1b8e53d139cbf1d2fb8061d967", "rev": "ac1acba43b2f9db073943ff5ed883ce7e8a40a2c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -152,11 +152,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1690134339, "lastModified": 1690307177,
"narHash": "sha256-+zAALvCHP+SzdsrRIVOHsBMEH2uADAQa29n1m94w7nc=", "narHash": "sha256-qU9w8lXIhBjN6TNrtfBIuWHv/VV4UKYDNlU0/blV4+4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "dd0c314217c07e3c4e84d288f8c4ec9119b109c3", "rev": "560e8e3df5a9f746df25469829033ee2f5210f5c",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -59,7 +59,7 @@
}; };
sound = { # ALSA sound enable sound = { # ALSA sound enable
enable = true; #enable = true;
mediaKeys = { # Keyboard Media Keys (for minimal desktop) enable = true; mediaKeys = { # Keyboard Media Keys (for minimal desktop) enable = true;
enable = true; enable = true;
}; };

View File

@ -153,7 +153,7 @@
# #
# Flatpak # Flatpak
#obs-studio # Recording/Live Streaming #obs-studio # Recording/Live Streaming
super-slicer-latest #super-slicer-latest
#vscodium #vscodium
(vscode-with-extensions.override { (vscode-with-extensions.override {
vscode = vscodium; vscode = vscodium;

View File

@ -23,7 +23,7 @@
imports = # For now, if applying to other system, swap files imports = # For now, if applying to other system, swap files
[(import ./hardware-configuration.nix)] ++ # Current system hardware config @ /etc/nixos/hardware-configuration.nix [(import ./hardware-configuration.nix)] ++ # Current system hardware config @ /etc/nixos/hardware-configuration.nix
[(import ../../modules/desktop/gnome/default.nix)] ++ # Window Manager [(import ../../modules/desktop/gnome/default.nix)] ++ # Window Manager
[(import ../../modules/desktop/virtualisation/default.nix)] ++ # Docker [(import ../../modules/desktop/virtualisation/docker.nix)] ++ # Docker
(import ../../modules/hardware); # Hardware devices (import ../../modules/hardware); # Hardware devices
boot = { # Boot options boot = { # Boot options
@ -54,6 +54,7 @@
# }; # };
programs = { # No xbacklight, this is the alterantive programs = { # No xbacklight, this is the alterantive
zsh.enable = true;
dconf.enable = true; dconf.enable = true;
light.enable = true; light.enable = true;
ssh.startAgent = false; ssh.startAgent = false;

View File

@ -20,6 +20,7 @@
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
boot.kernelParams = [ ]; boot.kernelParams = [ ];
boot.tmp.useTmpfs = true; boot.tmp.useTmpfs = true;
# zramSwap.enable = true; # zramSwap.enable = true;

View File

@ -24,6 +24,8 @@
}; };
}; };
hardware.pulseaudio.enable = lib.mkForce false;
hardware.opengl = { hardware.opengl = {
enable = true; enable = true;
driSupport = true; driSupport = true;
@ -41,14 +43,63 @@
services = { services = {
xserver = { xserver = {
enable = false;
desktopManager.gnome.enable = true; desktopManager.gnome.enable = true;
displayManager = { displayManager = {
gdm.wayland = true; gdm.wayland = true;
defaultSession = "steam-wayland"; # defaultSession = "steam-wayland";
autoLogin.enable = true; autoLogin.enable = true;
autoLogin.user = "kabbone"; autoLogin.user = "kabbone";
}; };
}; };
}; };
systemd.services.gamescope-switcher = {
wantedBy = [ "graphical.target" ];
serviceConfig = {
User = 2000;
PAMName = "login";
WorkingDirectory = "~";
TTYPath = "/dev/tty7";
TTYReset = "yes";
TTYVHangup = "yes";
TTYVTDisallocate = "yes";
StandardInput = "tty-fail";
StandardOutput = "journal";
StandardError = "journal";
UtmpIdentifier = "tty7";
UtmpMode = "user";
Restart = "always";
};
script = ''
set-session () {
mkdir -p ~/.local/state
>~/.local/state/steamos-session-select echo "$1"
}
consume-session () {
if [[ -e ~/.local/state/steamos-session-select ]]; then
cat ~/.local/state/steamos-session-select
rm ~/.local/state/steamos-session-select
else
echo "gamescope"
fi
}
while :; do
session=$(consume-session)
case "$session" in
plasma)
dbus-run-session -- gnome-shell --display-server --wayland
;;
gamescope)
steam-session
;;
esac
done
'';
};
} }

View File

@ -18,7 +18,7 @@
"org/gnome/desktop/a11y/applications" = { "org/gnome/desktop/a11y/applications" = {
screen-keyboard-enabled = true; screen-keyboard-enabled = true;
}; };
# "org/gnome/shell" = { "org/gnome/shell" = {
# enabled-extensions = [ # enabled-extensions = [
# "dash-to-dock@micxgx.gmail.com" # "dash-to-dock@micxgx.gmail.com"
# ]; # ];