From ab01622c67cc54fa089280e6cf91dc0cea69b1b9 Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Sun, 8 Sep 2024 13:12:59 -0700 Subject: [PATCH 1/4] change to nvidia --- provision/hosts/kestrel/configuration.nix | 9 +++++++++ provision/modules/gaming/steam.nix | 1 + 2 files changed, 10 insertions(+) diff --git a/provision/hosts/kestrel/configuration.nix b/provision/hosts/kestrel/configuration.nix index c2fa1cd3..5d8439a9 100644 --- a/provision/hosts/kestrel/configuration.nix +++ b/provision/hosts/kestrel/configuration.nix @@ -12,6 +12,15 @@ networking.firewall.checkReversePath = "loose"; networking.firewall.enable = false; + # Nvidia options + services.xserver.videoDrivers = ["nvidia"]; + hardware.nvidia = { + modesetting.enable = true; + open = true; + powerManagement.enable = true; + nvidiaSettings = true; + }; + # Enable docker virtualisation.docker.enable = true; virtualisation.docker.storageDriver = "btrfs"; diff --git a/provision/modules/gaming/steam.nix b/provision/modules/gaming/steam.nix index f33dbec6..0edc7254 100644 --- a/provision/modules/gaming/steam.nix +++ b/provision/modules/gaming/steam.nix @@ -19,6 +19,7 @@ in { environment.systemPackages = with pkgs; [ steamtinkerlaunch # Launcher and optimization tool for Steam games. gamescope # Utility for running games using Valve's Steam Play compatibility layer with improved performance and compatibility. + mangohud ]; }; } From 3ca46dd6cc07140ad065b268259b012d54790c13 Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Sun, 8 Sep 2024 18:32:11 -0700 Subject: [PATCH 2/4] update flake --- provision/flake.lock | 62 ++++++++++++++--------------- provision/modules/desktop/gnome.nix | 8 ++-- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/provision/flake.lock b/provision/flake.lock index 4f712289..c63b0316 100644 --- a/provision/flake.lock +++ b/provision/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1723405438, - "narHash": "sha256-bpmC2m7OhlDvqgQZdZ2jBLyeIkq/Jld3X4bqRAxBSp8=", + "lastModified": 1725199881, + "narHash": "sha256-jsmipf/u1GFZE5tBUkr56CHMN6VpUWCAjfLIhvQijU0=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "9312aa28271c91e5d67ecb9def527b2bbcff0e66", + "rev": "f8a687dd29ff019657498f1bd14da2fbbf0e604b", "type": "github" }, "original": { @@ -104,11 +104,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1725831139, + "narHash": "sha256-9syY5nEehCswE8AMcjpUO4T0iX9nrNbzq69Kqcs92L0=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "8a175a89137fe798b33c476d4dae17dba5fb3fd3", "type": "github" }, "original": { @@ -158,11 +158,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1723824059, - "narHash": "sha256-h0+WVPs3UEomWFXnGPIaOWLRB1OUZWx+Pk1EJB5M5Fk=", + "lastModified": 1725829447, + "narHash": "sha256-qwjdAZwqk8kWdJ/NQq0u5RQFA3NfCLOnyoeCDDTmaNM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "c5feee1e357f3c3c59ebe406630601c627807963", + "rev": "7c4c402bd7f24241c096d809cc80408a469f15cb", "type": "github" }, "original": { @@ -178,11 +178,11 @@ ] }, "locked": { - "lastModified": 1722636442, - "narHash": "sha256-+7IS0n3/F0I5j6ZbrVlLcIIPHY3o+/vLAqg/G48sG+w=", + "lastModified": 1725551787, + "narHash": "sha256-6LgsZHz8w3g4c9bRUwRAR+WIMwFGGf3P1VZQcKNRf2o=", "owner": "hyprwm", "repo": "contrib", - "rev": "9d67858b437d4a1299be496d371b66fc0d3e01f6", + "rev": "1e531dc49ad36c88b45bf836081a7a2c8927e072", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1721324361, - "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", + "lastModified": 1725188252, + "narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", + "rev": "c12ab785ce1982f82594aff03b3104c598186ddd", "type": "github" }, "original": { @@ -259,11 +259,11 @@ ] }, "locked": { - "lastModified": 1722869141, - "narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=", + "lastModified": 1724966483, + "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "0252fd13e78e60fb0da512a212e56007515a49f7", + "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2", "type": "github" }, "original": { @@ -300,11 +300,11 @@ "jovian-nixos": { "flake": false, "locked": { - "lastModified": 1723743257, - "narHash": "sha256-BunNxd6XYA9cyjgxOlGQrlgkiN8ClejGVkE8KWe9F2U=", + "lastModified": 1725600800, + "narHash": "sha256-wst7p3RZ9kZUNzN22d27wU8YSBB7Grlx6Q03A7boRaU=", "ref": "development", - "rev": "e4e0ca14918919300e04e80c34036028b4370640", - "revCount": 893, + "rev": "2d050e65a71e02a1f19d1a35c086bd2e3dfb2cdb", + "revCount": 918, "type": "git", "url": "https://github.com/Jovian-Experiments/Jovian-NixOS" }, @@ -332,11 +332,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1725103162, + "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "type": "github" }, "original": { @@ -348,11 +348,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "type": "github" }, "original": { @@ -419,11 +419,11 @@ ] }, "locked": { - "lastModified": 1722365976, - "narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=", + "lastModified": 1725203932, + "narHash": "sha256-VLULC/OnI+6R9KEP2OIGk+uLJJsfRlaLouZ5gyFd2+Y=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341", + "rev": "2425e8f541525fa7409d9f26a8ffaf92a3767251", "type": "github" }, "original": { diff --git a/provision/modules/desktop/gnome.nix b/provision/modules/desktop/gnome.nix index abecdcbe..20b010fc 100644 --- a/provision/modules/desktop/gnome.nix +++ b/provision/modules/desktop/gnome.nix @@ -52,10 +52,10 @@ in { snapshot # Utility for taking and managing system snapshots in the GNOME desktop environment. gnome-connections # GNOME application for accessing remote machines and services. gnome-font-viewer # Utility for previewing and managing fonts in the GNOME desktop environment. - gnome.gnome-logs # Log viewer application for GNOME. - gnome.gnome-maps # Map application for the GNOME desktop environment. - gnome.gnome-music # Music player and management application for GNOME. - gnome.gnome-shell-extensions # Extensions for enhancing functionality and customization in the GNOME. + gnome-logs # Log viewer application for GNOME. + gnome-maps # Map application for the GNOME desktop environment. + gnome-music # Music player and management application for GNOME. + gnome-shell-extensions # Extensions for enhancing functionality and customization in the GNOME. ]; # Valent for remote control From 553bb8e1aad99759ef3f9a6e74b2b75f05b73297 Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Sun, 8 Sep 2024 18:34:12 -0700 Subject: [PATCH 3/4] remove animations from gnome --- provision/modules/desktop/gnome.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/provision/modules/desktop/gnome.nix b/provision/modules/desktop/gnome.nix index 20b010fc..d77f63a7 100644 --- a/provision/modules/desktop/gnome.nix +++ b/provision/modules/desktop/gnome.nix @@ -130,6 +130,7 @@ in { dconf.settings = { "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; + enable-animations = false; }; "org/gnome/desktop/background" = { picture-options = "zoom"; From da685c3e1a75afc2fc6e2fdf02a4fc2a212bb3b8 Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Sun, 8 Sep 2024 19:38:25 -0700 Subject: [PATCH 4/4] add keybind and remove some terminal cruft --- provision/modules/desktop/gnome.nix | 1 + provision/modules/system/terminal.nix | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/provision/modules/desktop/gnome.nix b/provision/modules/desktop/gnome.nix index d77f63a7..a0fed24a 100644 --- a/provision/modules/desktop/gnome.nix +++ b/provision/modules/desktop/gnome.nix @@ -215,6 +215,7 @@ in { toggle-fullscreen = [ "f" ]; toggle-maximized = [ "t" ]; raise-or-lower = [ "s" ]; + move-to-center = [ "c" ]; switch-windows = ["Tab"]; switch-windows-backward = ["Tab"]; minimize = []; diff --git a/provision/modules/system/terminal.nix b/provision/modules/system/terminal.nix index d40bcf5c..165c4523 100644 --- a/provision/modules/system/terminal.nix +++ b/provision/modules/system/terminal.nix @@ -25,22 +25,12 @@ in { advcpmv # Advanced version of the Unix utilities cp and mv. unzip # Command-line utility for extracting files from ZIP archives. trash-cli # Command-line interface to the freedesktop.org Trash. - catimg # Display images in the terminal using ASCII characters. vim # Text editor that is highly configurable and widely used, especially in the Unix environment. neovim # Fork of Vim aiming to improve extensibility and usability. nodejs # JavaScript runtime built on Chrome's V8 JavaScript engine. ripgrep # Line-oriented search tool that recursively searches directories for a regex pattern. cargo # Package manager and build system for Rust. - taskwarrior # Command-line task management tool. - taskopen # Open Taskwarrior tasks in a text editor. - taskwarrior-tui # Interactive terminal user interface for Taskwarrior. - timewarrior # Command-line time tracking utility. - ollama # Command-line tool for viewing and managing Open Location Codes. docker-compose - opensc - pcsc-tools - firefox - pkcs11helper ]; }; }