Compare commits
No commits in common. "7943f84712a83b7a0ee5b11185367b51497f37f4" and "53a2609204c52b8c520d32e61390e6004d3d73cd" have entirely different histories.
7943f84712
...
53a2609204
27
flake.nix
27
flake.nix
|
@ -29,14 +29,8 @@
|
||||||
let
|
let
|
||||||
specialArgs = inputs;
|
specialArgs = inputs;
|
||||||
modules = [
|
modules = [
|
||||||
./specific/desktop/nixos.nix
|
./modules/nixos
|
||||||
home-manager.nixosModules.home-manager
|
./specific/wizdesk/nixos.nix
|
||||||
{
|
|
||||||
home-manager.extraSpecialArgs = inputs;
|
|
||||||
home-manager.useGlobalPkgs = true;
|
|
||||||
home-manager.useUserPackages = true;
|
|
||||||
home-manager.users.wizardlink = import ./specific/desktop/home-manager.nix;
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
nixpkgs.lib.nixosSystem { inherit system specialArgs modules; };
|
nixpkgs.lib.nixosSystem { inherit system specialArgs modules; };
|
||||||
|
@ -45,19 +39,20 @@
|
||||||
let
|
let
|
||||||
specialArgs = inputs;
|
specialArgs = inputs;
|
||||||
modules = [
|
modules = [
|
||||||
./specific/laptop/nixos.nix
|
./modules/nixos
|
||||||
home-manager.nixosModules.home-manager
|
./specific/wizlap/nixos.nix
|
||||||
{
|
|
||||||
home-manager.extraSpecialArgs = inputs;
|
|
||||||
home-manager.useGlobalPkgs = true;
|
|
||||||
home-manager.useUserPackages = true;
|
|
||||||
home-manager.users.wizardlink = import ./specific/laptop/home-manager.nix;
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
nixpkgs.lib.nixosSystem { inherit system specialArgs modules; };
|
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;
|
formatter."${system}" = pkgs.nixfmt-rfc-style;
|
||||||
|
|
||||||
homeManagerModules = {
|
homeManagerModules = {
|
||||||
|
|
|
@ -1,18 +1,4 @@
|
||||||
{ 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 {
|
xdg.configFile."hypr/frappe.conf".source = builtins.fetchurl {
|
||||||
url = "https://raw.githubusercontent.com/catppuccin/hyprland/main/themes/frappe.conf";
|
url = "https://raw.githubusercontent.com/catppuccin/hyprland/main/themes/frappe.conf";
|
||||||
sha256 = "1clw669i1n3dhawdw4clmjv75fy3smycb5iqk3sanzpr3y0i4vwx";
|
sha256 = "1clw669i1n3dhawdw4clmjv75fy3smycb5iqk3sanzpr3y0i4vwx";
|
||||||
|
@ -142,7 +128,6 @@
|
||||||
xdg.configFile."hypr/hyprland.conf".text = # hyprlang
|
xdg.configFile."hypr/hyprland.conf".text = # hyprlang
|
||||||
''
|
''
|
||||||
source = $HOME/.config/hypr/frappe.conf
|
source = $HOME/.config/hypr/frappe.conf
|
||||||
${config.modules.hyprland.extraConfig}
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Please note not all available settings / options are set here.
|
# Please note not all available settings / options are set here.
|
||||||
|
@ -151,6 +136,10 @@
|
||||||
|
|
||||||
autogenerated = 0 # remove this line to remove the warning
|
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
|
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
|
||||||
|
|
||||||
# Inject home-manager session variables
|
# Inject home-manager session variables
|
||||||
|
@ -369,5 +358,4 @@
|
||||||
windowrulev2 = noblur, tag:gw2
|
windowrulev2 = noblur, tag:gw2
|
||||||
windowrulev2 = noborder, tag:gw2
|
windowrulev2 = noborder, tag:gw2
|
||||||
'';
|
'';
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
#
|
#
|
||||||
|
@ -28,12 +28,4 @@
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
EDITOR = "nvim";
|
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
|
|
||||||
'';
|
|
||||||
}
|
}
|
|
@ -1,38 +0,0 @@
|
||||||
{ ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
#
|
|
||||||
## 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,16 +2,11 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../modules/nixos
|
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
./hardware.nix
|
./hardware.nix
|
||||||
./services.nix
|
./services.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
#
|
|
||||||
# NIXOS #
|
|
||||||
#
|
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||||
|
@ -20,10 +15,6 @@
|
||||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||||
system.stateVersion = "23.05";
|
system.stateVersion = "23.05";
|
||||||
|
|
||||||
#
|
|
||||||
# SYSTEM #
|
|
||||||
#
|
|
||||||
|
|
||||||
# Configure options for mounted volumes.
|
# Configure options for mounted volumes.
|
||||||
fileSystems = {
|
fileSystems = {
|
||||||
"/".options = [ "compress=zstd" ];
|
"/".options = [ "compress=zstd" ];
|
|
@ -2,25 +2,9 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../modules/nixos
|
|
||||||
./hardware.nix
|
./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.
|
networking.hostName = "wizlap"; # Define your hostname.
|
||||||
|
|
||||||
# Open ports in the firewall.
|
# Open ports in the firewall.
|
Loading…
Reference in a new issue