Cleanup and fixes in modularity

This commit is contained in:
foglar 2024-12-07 18:58:08 +01:00
parent 4aadbc9e02
commit af26d91fd6
10 changed files with 86 additions and 76 deletions

View File

@ -21,7 +21,7 @@ Places Icons Auto-resize=false
Places Icons Static Size=16 Places Icons Static Size=16
[KPropertiesDialog] [KPropertiesDialog]
2560x1080 screen: Window-Maximized=true 1920x1080 screen: Window-Maximized=true
[MainWindow] [MainWindow]
MenuBar=Disabled MenuBar=Disabled

View File

@ -40,10 +40,8 @@
self, self,
nixpkgs, nixpkgs,
nixpkgs-stable, nixpkgs-stable,
nix-ld,
... ...
} @ inputs: let } @ inputs: let
username = "foglar"; username = "foglar";
hostname = "laptop"; hostname = "laptop";
@ -74,7 +72,7 @@
modules = [ modules = [
./nixos/configuration.nix ./nixos/configuration.nix
inputs.stylix.nixosModules.stylix inputs.stylix.nixosModules.stylix
nix-ld.nixosModules.nix-ld inputs.nix-ld.nixosModules.nix-ld
{programs.nix-ld.dev.enable = true;} {programs.nix-ld.dev.enable = true;}
]; ];
}; };

View File

@ -13,7 +13,7 @@
]; ];
nix.settings.experimental-features = ["nix-command" "flakes"]; nix.settings.experimental-features = ["nix-command" "flakes"];
programs.nix-ld.dev.enable = true;
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;

View File

@ -237,9 +237,8 @@
# Rofi # Rofi
"$mod, A, exec, pkill -x rofi || rofi -show drun" "$mod, A, exec, pkill -x rofi || rofi -show drun"
#"$mod, A, exec, pkill -x rofi || rofilaunch.sh d" "$mod, Tab, exec, pkill -x rofi || rofi -show window"
#"$mod, Tab, exec, pkill -x rofi || rofilaunch.sh w" "$mod+Shift, E, exec, pkill -x rofi || rofi -show emoji"
#"$mod+Shift, E, exec, pkill -x rofi || rofilaunch.sh f"
# Grouped Windows # Grouped Windows
"$mod CTRL, H, changegroupactive, b" "$mod CTRL, H, changegroupactive, b"

View File

@ -1,5 +1,10 @@
{pkgs, pkgs-stable, ...}: { {
home.packages = (with pkgs; [ pkgs,
pkgs-stable,
...
}: {
home.packages =
(with pkgs; [
hyprlock hyprlock
hyprpicker hyprpicker
hypridle hypridle
@ -74,7 +79,8 @@
#(writeShellScriptBin "logoutlaunch") #(writeShellScriptBin "logoutlaunch")
#(writeShellScriptBin "sysmonlaunch") #(writeShellScriptBin "sysmonlaunch")
#(writeShellScriptBin "rofilaunch" '''') #(writeShellScriptBin "rofilaunch" '''')
]) ++ (with pkgs-stable; [ ])
++ (with pkgs-stable; [
pavucontrol pavucontrol
gnome.nautilus gnome.nautilus
]); ]);

View File

@ -1,6 +1,6 @@
{...}: { {username, ...}: {
home.username = "foglar"; home.username = "${username}";
home.homeDirectory = "/home/foglar"; home.homeDirectory = "/home/${username}";
home.stateVersion = "24.05"; # Please read the comment before changing. home.stateVersion = "24.05"; # Please read the comment before changing.
imports = [ imports = [
@ -9,8 +9,8 @@
]; ];
desktop.hyprland.enable = true; desktop.hyprland.enable = true;
programming.enable = true; group.programming.enable = true;
games.enable = true; group.games.enable = true;
gtk.enable = true; gtk.enable = true;

View File

@ -26,6 +26,14 @@
inkscape inkscape
gnome-disk-utility gnome-disk-utility
qbittorrent qbittorrent
(writeShellScriptBin "nvidia-offload" ''
export __NV_PRIME_RENDER_OFFLOAD=1
export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0
export __GLX_VENDOR_LIBRARY_NAME=nvidia
export __VK_LAYER_NV_optimus=NVIDIA_only
exec "$@"
'')
]) ])
++ (with pkgs-stable; [ ++ (with pkgs-stable; [
loupe loupe

View File

@ -16,14 +16,6 @@
heroic heroic
wine wine
(writeShellScriptBin "nvidia-offload" ''
export __NV_PRIME_RENDER_OFFLOAD=1
export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0
export __GLX_VENDOR_LIBRARY_NAME=nvidia
export __VK_LAYER_NV_optimus=NVIDIA_only
exec "$@"
'')
(writeShellScriptBin "gs" '' (writeShellScriptBin "gs" ''
set -xeuo pipefail set -xeuo pipefail

View File

@ -1,5 +1,6 @@
{ {
pkgs, pkgs,
pkgs-stable,
lib, lib,
config, config,
... ...
@ -42,7 +43,7 @@
"workbench.iconTheme" = "material-icon-theme"; "workbench.iconTheme" = "material-icon-theme";
"workbench.productIconTheme" = "material-product-icons"; "workbench.productIconTheme" = "material-product-icons";
"window.menuBarVisibility" = "toggle"; "window.menuBarVisibility" = "toggle";
"github.copilot.editor.enableAutoCompletions" = true; "github.copilot.editor.enableAutoCompletions" = false;
"[json]" = { "[json]" = {
"editor.defaultFormatter" = "esbenp.prettier-vscode"; "editor.defaultFormatter" = "esbenp.prettier-vscode";
}; };
@ -77,7 +78,7 @@
}; };
}; };
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs-stable.vscode-extensions; [
ms-azuretools.vscode-docker ms-azuretools.vscode-docker
# Mardown # Mardown

View File

@ -0,0 +1,6 @@
{lib}:
{
options = {
neovim = lib.mkEnableOption "neovim";
};
}