Skip to content

Commit

Permalink
flake.lock: Update (#56)
Browse files Browse the repository at this point in the history
* flake.lock: Update

Flake lock file updates:

• Updated input 'nixpkgs-edge':
    'github:NixOS/nixpkgs/20265e85a6edf425e6b6403149e759c6f2fc0e95?narHash=sha256-LSBrjBJV/sKyoRQ0j4p3cgQ0Sj4tEiKDr9Km5z9kaDg%3D' (2024-08-01)
  → 'github:NixOS/nixpkgs/e809abfeea97a37dbda4396c49dd80950e64ffb0?narHash=sha256-Z1nTLHbBoRAJKkNpycFKrZEx%2BvZPMhqhwgyBPpnQzok%3D' (2024-08-01)

* [create-pull-request] automated change

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
github-actions[bot] and github-actions[bot] committed Aug 1, 2024
1 parent 6573995 commit 56e061e
Show file tree
Hide file tree
Showing 9 changed files with 65 additions and 62 deletions.
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
};
outputs = inputs: inputs.flake-parts.lib.mkFlake {inherit inputs;} {imports = [./flake];};


# Allows the user to use our cache when using `nix run <thisFlake>`.
nixConfig = {
extra-substituters = [
Expand Down
2 changes: 1 addition & 1 deletion modules-overlays/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
programs.uwsm.enable = true;
programs.uwsm.package = pkgs-edge.uwsm;

boot.kernelParams = [ "systemd.unified_cgroup_hierachy=0" "SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE=1" ];
boot.kernelParams = ["systemd.unified_cgroup_hierachy=0" "SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE=1"];
}
44 changes: 22 additions & 22 deletions modules-overlays/uwsm/module.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,37 @@
lib,
pkgs,
...
}:
let
}: let
cfg = config.programs.uwsm;
in
{
in {
options.programs.uwsm = {
enable = lib.mkEnableOption ''uwsm, which wraps standalone
Wayland compositors into a set of Systemd units on the fly
enable = lib.mkEnableOption '' uwsm, which wraps standalone
Wayland compositors into a set of Systemd units on the fly
'';
package = lib.mkPackageOption pkgs "uwsm" {};
};

config = lib.mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
systemd.packages = [ cfg.package ];
environment.systemPackages = [cfg.package];
systemd.packages = [cfg.package];
services.dbus.implementation = "broker";

services.displayManager.sessionPackages = lib.optionals config.programs.hyprland.enable [
(pkgs.callPackage ./uwsm-wm-wrapper.nix {
uwsm = cfg.package;
wmName = "Hyprland";
wmCmd = "/run/current-system/sw/bin/Hyprland";
})
] ++ lib.optionals config.programs.sway.enable [
(pkgs.callPackage ./uwsm-wm-wrapper.nix {
uwsm = cfg.package;
wmName = "Sway";
wmCmd = "/run/current-system/sw/bin/sway";
})
];
services.displayManager.sessionPackages =
lib.optionals config.programs.hyprland.enable [
(pkgs.callPackage ./uwsm-wm-wrapper.nix {
uwsm = cfg.package;
wmName = "Hyprland";
wmCmd = "/run/current-system/sw/bin/Hyprland";
})
]
++ lib.optionals config.programs.sway.enable [
(pkgs.callPackage ./uwsm-wm-wrapper.nix {
uwsm = cfg.package;
wmName = "Sway";
wmCmd = "/run/current-system/sw/bin/sway";
})
];
};

meta.maintainers = with lib.maintainers; [ johnrtitor ];
meta.maintainers = with lib.maintainers; [johnrtitor];
}
42 changes: 21 additions & 21 deletions modules-overlays/uwsm/uwsm-wm-wrapper.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@
uwsm,
wmName ? "Example",
wmCmd ? "example",
}:
let
wm-desktop-entry = writeText "${wmName}_uwsm.desktop" ''
[Desktop Entry]
Name=${wmName} (with UWSM)
Comment=${wmName} compositor managed by UWSM
Exec=${lib.getExe uwsm} start -S -- ${wmCmd}
Type=Application
'';
in stdenvNoCC.mkDerivation {
pname = "${wmName}_uwsm";
version = "1.0.0";
dontUnpack = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/wayland-sessions
cp ${wm-desktop-entry} $out/share/wayland-sessions/${wmName}_uwsm.desktop
runHook postInstall
}: let
wm-desktop-entry = writeText "${wmName}_uwsm.desktop" ''
[Desktop Entry]
Name=${wmName} (with UWSM)
Comment=${wmName} compositor managed by UWSM
Exec=${lib.getExe uwsm} start -S -- ${wmCmd}
Type=Application
'';
passthru.providedSessions = ["${wmName}_uwsm"];
}
in
stdenvNoCC.mkDerivation {
pname = "${wmName}_uwsm";
version = "1.0.0";
dontUnpack = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/wayland-sessions
cp ${wm-desktop-entry} $out/share/wayland-sessions/${wmName}_uwsm.desktop
runHook postInstall
'';
passthru.providedSessions = ["${wmName}_uwsm"];
}
3 changes: 1 addition & 2 deletions programs/neovim.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{...}:
{
{...}: {
programs.neovim = {
enable = true; # Enable Neovim
vimAlias = true; # Enable vim alias
Expand Down
2 changes: 1 addition & 1 deletion system/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@
# Import if laptop mode is enabled
lib.optionals (systemSettings.laptop) [./power.nix];

system.nixos.tags = lib.mkDefault [ "cachyos" ];
system.nixos.tags = lib.mkDefault ["cachyos"];
}
20 changes: 11 additions & 9 deletions system/hardware/graphics.nix
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,17 @@ in {
libvdpau-va-gl
];
};
environment.systemPackages = (with pkgs; [
## GRAPHICS UTILS ##
clinfo # OpenCL hardware information
libva-utils # libva graphics library tools
vdpauinfo # vdpau graphics library tools
vulkan-tools # vulkan graphics library tools
]) ++ (with nur-amdgpu; [
amdgpu-pro-libs.prefixes
]);
environment.systemPackages =
(with pkgs; [
## GRAPHICS UTILS ##
clinfo # OpenCL hardware information
libva-utils # libva graphics library tools
vdpauinfo # vdpau graphics library tools
vulkan-tools # vulkan graphics library tools
])
++ (with nur-amdgpu; [
amdgpu-pro-libs.prefixes
]);

# Use modesetting driver for Xorg, its better and updated
# AMDGPU graphics driver for Xorg is deprecated
Expand Down
7 changes: 5 additions & 2 deletions system/safe-specialization.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{lib, pkgs, ... }:
{
lib,
pkgs,
...
}: {
# Creates a second boot entry with xanmod kernel and scx disabled
specialisation.safe.configuration = {
system.nixos.tags = [ "xanmod" ];
system.nixos.tags = ["xanmod"];
boot.kernelPackages = lib.mkForce pkgs.linuxPackages_xanmod_latest;
chaotic.scx.enable = lib.mkForce false;
};
Expand Down

0 comments on commit 56e061e

Please sign in to comment.