From 059f5efba35ea22899f83ab32649ace4d5ddfd07 Mon Sep 17 00:00:00 2001 From: Jacob Bachmann Date: Thu, 25 Jul 2024 16:54:52 +0200 Subject: [PATCH] feat: a lot of stuff --- flake.lock | 12 ++++++------ flake.nix | 4 +++- hosts/T430/default.nix | 2 +- modules/default.nix | 2 ++ modules/nautilus.nix | 18 ++++++++++++++++++ modules/wine.nix | 5 +++++ users/gandalf/modules/gui/programs/default.nix | 2 +- users/gandalf/modules/gui/programs/games.nix | 5 +++++ users/gandalf/modules/packages.nix | 1 + 9 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 modules/nautilus.nix create mode 100644 modules/wine.nix create mode 100644 users/gandalf/modules/gui/programs/games.nix diff --git a/flake.lock b/flake.lock index 02f168d..14fb289 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1720737798, - "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", + "lastModified": 1721323232, + "narHash": "sha256-T4K2P8FayLshsIkY04i7M8qs0aQY5ugf8HsghqGONCc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", + "rev": "ede1f14cc21e811a605f16c6b69bd3e8425383d7", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720954236, - "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", + "lastModified": 1721226092, + "narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=", "owner": "nixos", "repo": "nixpkgs", - "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", + "rev": "c716603a63aca44f39bef1986c13402167450e0a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4b1a9b1..75b4b93 100644 --- a/flake.nix +++ b/flake.nix @@ -39,7 +39,9 @@ inputs.home-manager.nixosModules.home-manager { - imports = [ ./users/gandalf ]; + imports = [ + ./users/gandalf + ]; } ]; diff --git a/hosts/T430/default.nix b/hosts/T430/default.nix index 94121ba..f14d737 100755 --- a/hosts/T430/default.nix +++ b/hosts/T430/default.nix @@ -26,7 +26,7 @@ devenv.enable = true; virtualisation.enable = true; - games.enable = false; + games.enable = true; ratbag.enable = true; ai.enable = false; diff --git a/modules/default.nix b/modules/default.nix index c363667..747ebc6 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -78,6 +78,7 @@ ./kdeconnect.nix ./keyd.nix ./man.nix + ./nautilus.nix ./network.nix ./nh.nix ./nix-ld.nix @@ -98,6 +99,7 @@ ./udisks2.nix ./virtualisation.nix ./vpn.nix + ./wine.nix ./xdg-portal.nix ]; } diff --git a/modules/nautilus.nix b/modules/nautilus.nix new file mode 100644 index 0000000..5c6b169 --- /dev/null +++ b/modules/nautilus.nix @@ -0,0 +1,18 @@ +{ pkgs, lib, config, ... }: with config.bchmnn; lib.mkIf (gui.enable && gui.flavour != [ ]) { + programs.nautilus-open-any-terminal = { + enable = true; + terminal = "alacritty"; + }; + + environment = { + sessionVariables.NAUTILUS_4_EXTENSION_DIR = "${pkgs.gnome.nautilus-python}/lib/nautilus/extensions-4"; + pathsToLink = [ + "/share/nautilus-python/extensions" + ]; + + systemPackages = with pkgs; [ + gnome.nautilus + gnome.nautilus-python + ]; + }; +} diff --git a/modules/wine.nix b/modules/wine.nix new file mode 100644 index 0000000..41143de --- /dev/null +++ b/modules/wine.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: { + environment.systemPackages = with pkgs; [ + wineWowPackages.waylandFull + ]; +} diff --git a/users/gandalf/modules/gui/programs/default.nix b/users/gandalf/modules/gui/programs/default.nix index 187325f..4c29c77 100644 --- a/users/gandalf/modules/gui/programs/default.nix +++ b/users/gandalf/modules/gui/programs/default.nix @@ -4,6 +4,7 @@ ./alacritty.nix ./chromium ./discord.nix + ./games.nix ./keyring.nix ./obs.nix ./vscode.nix @@ -23,7 +24,6 @@ signal-desktop # private, simple, and secure messenger zoom-us # zoom.us video conferencing application - gnome.nautilus # the file manager for gnome gnome.simple-scan # simple scanning utility gnome.gnome-font-viewer # program that can preview fonts and create thumbnails for fonts pppdf diff --git a/users/gandalf/modules/gui/programs/games.nix b/users/gandalf/modules/gui/programs/games.nix new file mode 100644 index 0000000..a3e5a81 --- /dev/null +++ b/users/gandalf/modules/gui/programs/games.nix @@ -0,0 +1,5 @@ +{ nixosConfig, lib, pkgs, ... }: lib.mkIf nixosConfig.bchmnn.games.enable { + home.packages = with pkgs; [ + extremetuxracer + ]; +} diff --git a/users/gandalf/modules/packages.nix b/users/gandalf/modules/packages.nix index 58de193..b484176 100644 --- a/users/gandalf/modules/packages.nix +++ b/users/gandalf/modules/packages.nix @@ -14,6 +14,7 @@ texliveFull # tex live environment imagemagick # software suite to create, edit, compose, or convert bitmap images ghostscript # postscript interpreter (mainline version) + pdftk # command-line tool for working with pdfs ventoy-full # bootable usb solution isisdl # downloader for isis of tu-berlin sage # open source mathematics software, free alternative to magma, maple, mathematica, and matlab