Compare commits
3 commits
53a2609204
...
7943f84712
Author | SHA1 | Date | |
---|---|---|---|
Alexandre Cavalheiro | 7943f84712 | ||
Alexandre Cavalheiro | 9e271f8c52 | ||
Alexandre Cavalheiro | 5b0e693498 |
27
flake.nix
27
flake.nix
|
@ -29,8 +29,14 @@
|
|||
let
|
||||
specialArgs = inputs;
|
||||
modules = [
|
||||
./modules/nixos
|
||||
./specific/wizdesk/nixos.nix
|
||||
./specific/desktop/nixos.nix
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.extraSpecialArgs = inputs;
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.wizardlink = import ./specific/desktop/home-manager.nix;
|
||||
}
|
||||
];
|
||||
in
|
||||
nixpkgs.lib.nixosSystem { inherit system specialArgs modules; };
|
||||
|
@ -39,20 +45,19 @@
|
|||
let
|
||||
specialArgs = inputs;
|
||||
modules = [
|
||||
./modules/nixos
|
||||
./specific/wizlap/nixos.nix
|
||||
./specific/laptop/nixos.nix
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.extraSpecialArgs = inputs;
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.wizardlink = import ./specific/laptop/home-manager.nix;
|
||||
}
|
||||
];
|
||||
in
|
||||
nixpkgs.lib.nixosSystem { inherit system specialArgs modules; };
|
||||
};
|
||||
|
||||
homeConfigurations.wizardlink = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
|
||||
extraSpecialArgs = inputs;
|
||||
modules = [ ./specific/home-manager.nix ];
|
||||
};
|
||||
|
||||
formatter."${system}" = pkgs.nixfmt-rfc-style;
|
||||
|
||||
homeManagerModules = {
|
||||
|
|
|
@ -1,4 +1,18 @@
|
|||
{ config, lib, ... }:
|
||||
|
||||
{
|
||||
options.modules.hyprland.extraConfig = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "";
|
||||
example = # hyprlang
|
||||
''
|
||||
monitor = DP-3, 1920x1080@74.973, 2560x0, 1
|
||||
monitor = DP-2, 2560x1440@165.00301, 0x0, 1
|
||||
'';
|
||||
description = "Configuration to be appended to my own.";
|
||||
};
|
||||
|
||||
config = {
|
||||
xdg.configFile."hypr/frappe.conf".source = builtins.fetchurl {
|
||||
url = "https://raw.githubusercontent.com/catppuccin/hyprland/main/themes/frappe.conf";
|
||||
sha256 = "1clw669i1n3dhawdw4clmjv75fy3smycb5iqk3sanzpr3y0i4vwx";
|
||||
|
@ -128,6 +142,7 @@
|
|||
xdg.configFile."hypr/hyprland.conf".text = # hyprlang
|
||||
''
|
||||
source = $HOME/.config/hypr/frappe.conf
|
||||
${config.modules.hyprland.extraConfig}
|
||||
|
||||
#
|
||||
# Please note not all available settings / options are set here.
|
||||
|
@ -136,10 +151,6 @@
|
|||
|
||||
autogenerated = 0 # remove this line to remove the warning
|
||||
|
||||
# See https://wiki.hyprland.org/Configuring/Monitors/
|
||||
monitor = DP-3, 1920x1080@74.973, 2560x0, 1
|
||||
monitor = DP-2, 2560x1440@165.00301, 0x0, 1
|
||||
|
||||
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
|
||||
|
||||
# Inject home-manager session variables
|
||||
|
@ -358,4 +369,5 @@
|
|||
windowrulev2 = noblur, tag:gw2
|
||||
windowrulev2 = noborder, tag:gw2
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, ... }:
|
||||
{ ... }:
|
||||
|
||||
{
|
||||
#
|
||||
|
@ -28,4 +28,12 @@
|
|||
home.sessionVariables = {
|
||||
EDITOR = "nvim";
|
||||
};
|
||||
|
||||
# Add monitor configuration to hyprland
|
||||
modules.hyprland.extraConfig = # hyprlang
|
||||
''
|
||||
# See https://wiki.hyprland.org/Configuring/Monitors/
|
||||
monitor = DP-3, 1920x1080@74.973, 2560x0, 1
|
||||
monitor = DP-2, 2560x1440@165.00301, 0x0, 1
|
||||
'';
|
||||
}
|
|
@ -2,11 +2,16 @@
|
|||
|
||||
{
|
||||
imports = [
|
||||
../../modules/nixos
|
||||
./hardware-configuration.nix
|
||||
./hardware.nix
|
||||
./services.nix
|
||||
];
|
||||
|
||||
#
|
||||
# NIXOS #
|
||||
#
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
# settings for stateful data, like file locations and database versions
|
||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||
|
@ -15,6 +20,10 @@
|
|||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "23.05";
|
||||
|
||||
#
|
||||
# SYSTEM #
|
||||
#
|
||||
|
||||
# Configure options for mounted volumes.
|
||||
fileSystems = {
|
||||
"/".options = [ "compress=zstd" ];
|
38
specific/laptop/home-manager.nix
Normal file
38
specific/laptop/home-manager.nix
Normal file
|
@ -0,0 +1,38 @@
|
|||
{ ... }:
|
||||
|
||||
{
|
||||
#
|
||||
## HOME CONFIGURATION #
|
||||
#
|
||||
|
||||
# Import configurations for better modularity.
|
||||
imports = [
|
||||
../../modules/home-manager
|
||||
];
|
||||
|
||||
# Home Manager needs a bit of information about you and the paths it should
|
||||
# manage.
|
||||
home.username = "wizardlink";
|
||||
home.homeDirectory = "/home/wizardlink";
|
||||
|
||||
# This value determines the Home Manager release that your configuration is
|
||||
# compatible with. This helps avoid breakage when a new Home Manager release
|
||||
# introduces backwards incompatible changes.
|
||||
#
|
||||
# You should not change this value, even if you update Home Manager. If you do
|
||||
# want to update the value, then make sure to first check the Home Manager
|
||||
# release notes.
|
||||
home.stateVersion = "23.05"; # Please read the comment before changing.
|
||||
|
||||
home.sessionVariables = {
|
||||
EDITOR = "nvim";
|
||||
};
|
||||
|
||||
# Add monitor configuration to hyprland
|
||||
modules.hyprland.extraConfig = # hyprlang
|
||||
''
|
||||
# See https://wiki.hyprland.org/Configuring/Monitors/
|
||||
monitor = DP-3, 1920x1080@74.973, 2561x0, 1
|
||||
monitor = DP-2, 2560x1440@165.00301, 0x0, 1
|
||||
'';
|
||||
}
|
|
@ -2,9 +2,25 @@
|
|||
|
||||
{
|
||||
imports = [
|
||||
../../modules/nixos
|
||||
./hardware.nix
|
||||
];
|
||||
|
||||
#
|
||||
# NIXOS #
|
||||
#
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
# settings for stateful data, like file locations and database versions
|
||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||
# this value at the release version of the first install of this system.
|
||||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "23.05";
|
||||
|
||||
#
|
||||
# SYSTEM #
|
||||
#
|
||||
networking.hostName = "wizlap"; # Define your hostname.
|
||||
|
||||
# Open ports in the firewall.
|
Loading…
Reference in a new issue