forked from autowolf/nix
hopefully this fixes it?
This commit is contained in:
parent
fb4b2c1ed9
commit
a97c3b3885
5 changed files with 80 additions and 50 deletions
|
|
@ -9,7 +9,14 @@
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs = {
|
||||||
|
config.allowUnfree = true;
|
||||||
|
overlays = [
|
||||||
|
(self: super: {
|
||||||
|
hyprland = inputs.hyprland-git.packages."x86_64-linux".hyprland;
|
||||||
|
})
|
||||||
|
];
|
||||||
|
};
|
||||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||||
|
|
||||||
# Use the systemd-boot EFI boot loader.
|
# Use the systemd-boot EFI boot loader.
|
||||||
|
|
@ -45,11 +52,20 @@
|
||||||
tree
|
tree
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
home-manager = {
|
||||||
|
useGlobalPkgs = true;
|
||||||
|
useUserPackages = true;
|
||||||
|
extraSpecialArgs = {inherit inputs;};
|
||||||
|
|
||||||
|
users.ashley = import ./home.nix;
|
||||||
|
};
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
displayManager.sddm = {
|
displayManager = {
|
||||||
enable = true;
|
sddm = {
|
||||||
wayland.enable = true;
|
enable = true;
|
||||||
|
wayland.enable = ! config.services.xserver.enable; # experimental
|
||||||
|
};
|
||||||
defaultSession = "hyprland";
|
defaultSession = "hyprland";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -68,15 +84,22 @@
|
||||||
programs = {
|
programs = {
|
||||||
hyprland = {
|
hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = inputs.hyprland-git.packages."x86_64-linux".hyprland;
|
withUWSM = true; # Universal Wayland Session Manager
|
||||||
|
xwayland.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
gamemode.enable = true;
|
||||||
steam = {
|
steam = {
|
||||||
enable = true;
|
enable = true;
|
||||||
remotePlay.openFirewall = true; # optional
|
gamescopeSession.enable = true; # .desktop entry for gamescope
|
||||||
dedicatedServer.openFirewall = true; # optional
|
|
||||||
localNetworkGameTransfers.openFirewall = true; # optional
|
remotePlay.openFirewall = true;
|
||||||
gamescopeSession.enable = true; # optional
|
dedicatedServer.openFirewall = true;
|
||||||
|
localNetworkGameTransfers.openFirewall = true;
|
||||||
|
|
||||||
|
# extraCompatPackages = with pkgs; [
|
||||||
|
# proton-ge-bin
|
||||||
|
# ];
|
||||||
};
|
};
|
||||||
|
|
||||||
silentSDDM = {
|
silentSDDM = {
|
||||||
|
|
@ -104,9 +127,12 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
# nvidia drivers
|
# nvidia drivers
|
||||||
nvidia = rec {
|
nvidia = {
|
||||||
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||||
open = lib.mkOverride 990 (package ? open && package ? firmware);
|
|
||||||
|
# WARNING: whether to use open-source or proprietary kernel modules
|
||||||
|
# open = lib.mkOverride 990 (package ? open && package ? firmware);
|
||||||
|
open = true;
|
||||||
|
|
||||||
nvidiaSettings = true;
|
nvidiaSettings = true;
|
||||||
modesetting.enable = true;
|
modesetting.enable = true;
|
||||||
|
|
@ -122,6 +148,12 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
|
# NOTE: loaded earlier than `environment.variables`
|
||||||
|
sessionVariables = {
|
||||||
|
# Hint Electrons apps to use Wayland
|
||||||
|
NIXOS_OZONE_WL = "1";
|
||||||
|
};
|
||||||
|
|
||||||
variables = {
|
variables = {
|
||||||
EDITOR = "nvim";
|
EDITOR = "nvim";
|
||||||
};
|
};
|
||||||
|
|
@ -132,6 +164,8 @@
|
||||||
git
|
git
|
||||||
neovim
|
neovim
|
||||||
wget
|
wget
|
||||||
|
|
||||||
|
steamcmd
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
22
flake.lock
generated
22
flake.lock
generated
|
|
@ -161,7 +161,9 @@
|
||||||
"hyprutils": "hyprutils",
|
"hyprutils": "hyprutils",
|
||||||
"hyprwayland-scanner": "hyprwayland-scanner",
|
"hyprwayland-scanner": "hyprwayland-scanner",
|
||||||
"hyprwire": "hyprwire",
|
"hyprwire": "hyprwire",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
"pre-commit-hooks": "pre-commit-hooks",
|
"pre-commit-hooks": "pre-commit-hooks",
|
||||||
"systems": "systems",
|
"systems": "systems",
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
|
|
@ -428,22 +430,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1766070988,
|
|
||||||
"narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "c6245e83d836d0433170a16eb185cefe0572f8b8",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_2": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771369470,
|
"lastModified": 1771369470,
|
||||||
"narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
|
"narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
|
||||||
|
|
@ -487,7 +473,7 @@
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"hyprland-git": "hyprland-git",
|
"hyprland-git": "hyprland-git",
|
||||||
"nixcats": "nixcats",
|
"nixcats": "nixcats",
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs",
|
||||||
"silentSDDM": "silentSDDM"
|
"silentSDDM": "silentSDDM"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
18
flake.nix
18
flake.nix
|
|
@ -3,6 +3,7 @@
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
|
|
||||||
# home-manager, used for managing user configuration
|
# home-manager, used for managing user configuration
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/master";
|
url = "github:nix-community/home-manager/master";
|
||||||
|
|
@ -12,6 +13,7 @@
|
||||||
# to avoid problems caused by different versions of nixpkgs.
|
# to avoid problems caused by different versions of nixpkgs.
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
silentSDDM = {
|
silentSDDM = {
|
||||||
url = "github:uiriansan/SilentSDDM";
|
url = "github:uiriansan/SilentSDDM";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
@ -21,13 +23,14 @@
|
||||||
|
|
||||||
hyprland-git = {
|
hyprland-git = {
|
||||||
url = "github:hyprwm/Hyprland/25250527793eb04bb60f103abe7f06370b9f6e1c";
|
url = "github:hyprwm/Hyprland/25250527793eb04bb60f103abe7f06370b9f6e1c";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs @ {
|
outputs = inputs @ {
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
home-manager,
|
home-manager,
|
||||||
nixcats,
|
silentSDDM,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
|
|
@ -35,21 +38,10 @@
|
||||||
specialArgs = {inherit inputs;};
|
specialArgs = {inherit inputs;};
|
||||||
modules = [
|
modules = [
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
inputs.silentSDDM.nixosModules.default
|
|
||||||
|
|
||||||
# make home-manager as a module of nixos
|
# make home-manager as a module of nixos
|
||||||
# so that home-manager configuration will be deployed automatically when executing `nixos-rebuild switch`
|
# so that home-manager configuration will be deployed automatically when executing `nixos-rebuild switch`
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
{
|
silentSDDM.nixosModules.default
|
||||||
home-manager.useGlobalPkgs = true;
|
|
||||||
home-manager.useUserPackages = true;
|
|
||||||
|
|
||||||
home-manager.extraSpecialArgs = {inherit inputs;};
|
|
||||||
|
|
||||||
home-manager.users.ashley = import ./home.nix;
|
|
||||||
|
|
||||||
# Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
24
home.nix
24
home.nix
|
|
@ -40,5 +40,29 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
services.kanshi = {
|
||||||
|
enable = true;
|
||||||
|
systemdTarget = "hyprland-session.target";
|
||||||
|
|
||||||
|
settings = [
|
||||||
|
{
|
||||||
|
# laptop screen
|
||||||
|
output.criteria = "eDP-1"; # XXX: TODO
|
||||||
|
output.mode = "1920x1080@240.00Hz";
|
||||||
|
output.scale = 1.0;
|
||||||
|
output.adaptiveSync = false; # Variable Refresh Rate
|
||||||
|
}
|
||||||
|
{
|
||||||
|
profile.name = "girlCore";
|
||||||
|
profile.outputs = [
|
||||||
|
{
|
||||||
|
criteria = "eDP-1"; # laptop screen
|
||||||
|
position = "0,0";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
home.stateVersion = "25.11";
|
home.stateVersion = "25.11";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,10 @@
|
||||||
{
|
{inputs, ...}: let
|
||||||
inputs,
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
utils = inputs.nixcats.utils;
|
utils = inputs.nixcats.utils;
|
||||||
in {
|
in {
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
inputs.nixcats.homeModule
|
inputs.nixcats.homeModule
|
||||||
];
|
];
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
# this value, nixCats is the defaultPackageName you pass to mkNixosModules
|
# this value, nixCats is the defaultPackageName you pass to mkNixosModules
|
||||||
# it will be the namespace for your options.
|
# it will be the namespace for your options.
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue