Update flake

This commit is contained in:
muon 2024-06-11 22:32:13 +00:00
parent 97e5f1fe15
commit 72b7e5e708
9 changed files with 47 additions and 20 deletions

1
error.txt Normal file
View file

@ -0,0 +1 @@
setting up /etc...

18
flake.lock generated
View file

@ -170,11 +170,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717525419, "lastModified": 1717931644,
"narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", "narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a7117efb3725e6197dd95424136f79147aa35e5b", "rev": "3d65009effd77cb0d6e7520b68b039836a7606cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -206,11 +206,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1717602782, "lastModified": 1717974879,
"narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -258,11 +258,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1717593209, "lastModified": 1718122552,
"narHash": "sha256-Hc8yIj1CDuVOpUV13ZWvR+5CPXysBmuUqqB8bJ7/CgQ=", "narHash": "sha256-A+dBkSwp8ssHKV/WyXb9uqIYrHBqHvtSedU24Lq9lqw=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "1d3826ceed91ae67562f28ee2e135813a11e47a6", "rev": "e59d2c1725b237c362e4a62f5722f5b268d566c7",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -5,10 +5,11 @@
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
# stylix.url = "github:danth/stylix/release-23.11";
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix";
}; };
outputs = inputs@{ nixpkgs, home-manager, ... }: outputs = inputs@{ nixpkgs, home-manager, stylix, ... }:
let let
system = "x86_64-linux"; system = "x86_64-linux";

View file

@ -21,19 +21,20 @@ in {
inputs.self.outputs.homeManagerModules.default inputs.self.outputs.homeManagerModules.default
]; ];
}; };
backupFileExtension = "bak";
}; };
# Modules # Modules
mods.desktop.enable = true; mods.desktop.enable = true;
mods.desktop.wayland.enable = true; mods.desktop.wayland.enable = false;
mods.theme.enable = true; mods.theme.enable = true;
mods.theme.wallpaper = ./wallpaper.png; mods.theme.wallpaper = ./wallpaper.png;
mods.social.enable = true; services.xserver.windowManager.i3.enable = true;
# Proprietary </3 # Proprietary </3
mods.unfree.steam.enable = true; mods.unfree.steam.enable = true;
mods.unfree.nvidia.enable = false; mods.unfree.nvidia.enable = true;
# Hardware settings # Hardware settings
services.xserver.displayManager.sessionCommands = '' services.xserver.displayManager.sessionCommands = ''
@ -43,6 +44,24 @@ in {
# services.xserver.displayManager.setupCommands = '' # services.xserver.displayManager.setupCommands = ''
# ${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-1 --mode 1920x1080 --pos 2560x0 --rotate right --output DP-2 --primary --mode 2560x1440 --pos 0x480 --rotate normal # ${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-1 --mode 1920x1080 --pos 2560x0 --rotate right --output DP-2 --primary --mode 2560x1440 --pos 0x480 --rotate normal
# ''; # '';
services.xserver.xrandrHeads = [
{
output = "DP-2";
primary = true;
monitorConfig = ''
Option "PreferredMode" "2560x1440"
Option "Position" "0 480"
'';
}
{
output = "HDMI-1";
monitorConfig = ''
Option "PreferredMode" "1920x1080"
Option "Position" "2560 0"
Option "Rotate" "right"
'';
}
];
# Backup environment # Backup environment
services.xserver.windowManager.qtile.enable = true; services.xserver.windowManager.qtile.enable = true;

View file

@ -5,9 +5,13 @@ let cfg = osConfig.mods; in {
home.homeDirectory = "/home/${cfg.user.name}"; home.homeDirectory = "/home/${cfg.user.name}";
# Modules # Modules
# mods.module.enable = true;
programs.helix.enable = true; programs.helix.enable = true;
programs.qutebrowser.enable = true; programs.qutebrowser.enable = true;
mods.social.enable = true;
mods.i3.enable = true;
mods.terminal.emulator.enable = true;
mods.terminal.development.enable = true;
mods.terminal.tools.enable = true;
# Hardware settings # Hardware settings
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {

View file

@ -8,7 +8,6 @@ in {
./social.nix ./social.nix
]; ];
config = lib.mkIf cfg.wayland.enable { mods.hyprland.enable = lib.mkIf cfg.wayland.enable true;
mods.hyprland.enable = true; mods.i3.enable = lib.mkIf osConfig.services.xserver.windowManager.i3.enable true;
};
} }

View file

@ -1,14 +1,15 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
options.mods.i3.enable = lib.mkEnableOption "enables bspwm"; options.mods.i3.enable = lib.mkEnableOption "enables bspwm";
config = lib.mkIf config.mods.bspwm.enable { config = lib.mkIf config.mods.i3.enable {
programs.rofi.enable = true; programs.rofi.enable = true;
xsession.windowManager.i3 = { xsession.windowManager.i3 = {
enable = true; enable = true;
config = { config = {
modifier = "Mod4";
terminal = "alacritty"; terminal = "alacritty";
menu = "rofi"; menu = "rofi -show drun";
keybindings = let keybindings = let
modifier = config.xsession.windowManager.i3.config.modifier; modifier = config.xsession.windowManager.i3.config.modifier;

View file

@ -16,6 +16,8 @@ in {
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
stylix.enable = true;
stylix.autoEnable = true;
stylix.base16Scheme = cfg.scheme; stylix.base16Scheme = cfg.scheme;
stylix.image = cfg.wallpaper; stylix.image = cfg.wallpaper;

View file

@ -33,7 +33,7 @@ in {
hardware.nvidia = { hardware.nvidia = {
modesetting.enable = true; modesetting.enable = true;
powerManagement.enable = true; powerManagement.enable = false;
powerManagement.finegrained = false; powerManagement.finegrained = false;
open = false; open = false;