Compare commits

..

No commits in common. "8457523518b658fe8ac862cb1c5a9fca41fee4b0" and "9bc392818f5a7b7ed0604006ecaaf8f066ad69cc" have entirely different histories.

8 changed files with 30 additions and 16 deletions

26
flake.lock generated
View File

@ -287,9 +287,7 @@
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"hyprutils": "hyprutils", "hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": [ "nixpkgs": "nixpkgs",
"nixpkgs"
],
"systems": "systems", "systems": "systems",
"xdph": "xdph" "xdph": "xdph"
}, },
@ -557,13 +555,13 @@
"locked": { "locked": {
"lastModified": 1728018373, "lastModified": 1728018373,
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
@ -648,6 +646,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1728018373,
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
@ -686,7 +700,7 @@
"nix-ld": "nix-ld", "nix-ld": "nix-ld",
"nix-matlab": "nix-matlab", "nix-matlab": "nix-matlab",
"nix-topology": "nix-topology", "nix-topology": "nix-topology",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-stable": "nixpkgs-stable_2",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"snowfall-lib": "snowfall-lib", "snowfall-lib": "snowfall-lib",

View File

@ -34,7 +34,7 @@
sops-nix.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.inputs.nixpkgs.follows = "nixpkgs";
hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
hyprland.inputs.nixpkgs.follows = "nixpkgs"; # hyprland.inputs.nixpkgs.follows = "nixpkgs";
hyprland-plugins = { hyprland-plugins = {
url = "github:hyprwm/hyprland-plugins"; url = "github:hyprwm/hyprland-plugins";

View File

@ -87,7 +87,7 @@ in
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
# Whether to enable Hyprland wayland compositor # Whether to enable Hyprland wayland compositor
enable = true; enable = true;
package = inputs.hyprland.packages."${pkgs.system}".hyprland; # does only work with nixos-unstable # package = inputs.hyprland.packages."${pkgs.system}".hyprland; # does only work with nixos-unstable
# The hyprland package to use (simplifies use of plugins) # The hyprland package to use (simplifies use of plugins)
# package = inputs.hyprland.packages.${pkgs.system}.hyprland; # package = inputs.hyprland.packages.${pkgs.system}.hyprland;
@ -100,9 +100,9 @@ in
# Make PATH available to systemd services # Make PATH available to systemd services
systemd.variables = [ "--all" ]; systemd.variables = [ "--all" ];
plugins = [ plugins = with pkgs; [
inputs.hyprland-plugins.packages.${pkgs.system}.hyprbars # does only work with nixos-unstable # inputs.hyprland-plugins.packages.${pkgs.system}.hyprbars # does only work with nixos-unstable
# hyprlandPlugins.hyprbars hyprlandPlugins.hyprbars
]; ];
settings = { settings = {

View File

@ -31,7 +31,7 @@ in
programs.kitty = { programs.kitty = {
enable = true; enable = true;
shellIntegration.enableFishIntegration = true; shellIntegration.enableFishIntegration = true;
themeFile = "Catppuccin-Mocha"; theme = "Catppuccin-Mocha";
settings = { settings = {
enable_audio_bell = false; enable_audio_bell = false;
confirm_os_window_close = 0; # no ask on quit confirm_os_window_close = 0; # no ask on quit

View File

@ -30,7 +30,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
programs.hyprland.enable = true; programs.hyprland.enable = true;
programs.hyprland.package = inputs.hyprland.packages.${pkgs.system}.hyprland; # does only work with nixos-unstable # programs.hyprland.package = inputs.hyprland.packages.${pkgs.system}.hyprland; # does only work with nixos-unstable
programs.hyprland.xwayland.enable = true; programs.hyprland.xwayland.enable = true;
security.pam.services.hyprlock = { }; security.pam.services.hyprlock = { };
services.displayManager.defaultSession = "hyprland"; services.displayManager.defaultSession = "hyprland";

View File

@ -101,7 +101,7 @@
]; ];
}; };
hardware.graphics.enable = true; hardware.opengl.enable = true;
services.xserver.wacom.enable = true; services.xserver.wacom.enable = true;

View File

@ -95,7 +95,7 @@
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [ "nvidia" ];
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_470; hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_470;
hardware.graphics.enable = true; hardware.opengl.enable = true;
# hardware.nvidia.modesetting.enable = true; # for wayland # hardware.nvidia.modesetting.enable = true; # for wayland
nix.gc = { nix.gc = {

View File

@ -51,7 +51,7 @@
# Enable the X11 windowing system. # Enable the X11 windowing system.
services.xserver.enable = true; services.xserver.enable = true;
hardware.graphics.enable = true; hardware.opengl.enable = true;
nix.gc = { nix.gc = {
automatic = true; automatic = true;