alejandra, nix lsp
This commit is contained in:
parent
d44a2ff849
commit
a4e5b89f0e
3 changed files with 157 additions and 151 deletions
31
flake.nix
31
flake.nix
|
|
@ -23,18 +23,23 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, home-manager, nix-colors, disko, ... } @ inputs:
|
outputs = {
|
||||||
let
|
self,
|
||||||
|
nixpkgs,
|
||||||
|
home-manager,
|
||||||
|
nix-colors,
|
||||||
|
disko,
|
||||||
|
...
|
||||||
|
} @ inputs: let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
};
|
};
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
nixosConfigurations.virgil = nixpkgs.lib.nixosSystem {
|
nixosConfigurations.virgil = nixpkgs.lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
specialArgs = { inherit inputs; };
|
specialArgs = {inherit inputs;};
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/virgil/configuration.nix
|
./hosts/virgil/configuration.nix
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
|
|
@ -43,11 +48,11 @@
|
||||||
home-manager = {
|
home-manager = {
|
||||||
useGlobalPkgs = true;
|
useGlobalPkgs = true;
|
||||||
useUserPackages = true;
|
useUserPackages = true;
|
||||||
extraSpecialArgs = { inherit inputs nix-colors; };
|
extraSpecialArgs = {inherit inputs nix-colors;};
|
||||||
backupFileExtension = "backup";
|
backupFileExtension = "backup";
|
||||||
|
|
||||||
users.tulg = {
|
users.tulg = {
|
||||||
imports = [ ./modules/home.nix ];
|
imports = [./modules/home.nix];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -56,7 +61,7 @@
|
||||||
|
|
||||||
nixosConfigurations.archangel = nixpkgs.lib.nixosSystem {
|
nixosConfigurations.archangel = nixpkgs.lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
specialArgs = { inherit inputs; };
|
specialArgs = {inherit inputs;};
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/archangel/configuration.nix
|
./hosts/archangel/configuration.nix
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
|
|
@ -65,11 +70,11 @@
|
||||||
home-manager = {
|
home-manager = {
|
||||||
useGlobalPkgs = true;
|
useGlobalPkgs = true;
|
||||||
useUserPackages = true;
|
useUserPackages = true;
|
||||||
extraSpecialArgs = { inherit inputs nix-colors; };
|
extraSpecialArgs = {inherit inputs nix-colors;};
|
||||||
backupFileExtension = "backup";
|
backupFileExtension = "backup";
|
||||||
|
|
||||||
users.tulg = {
|
users.tulg = {
|
||||||
imports = [ ./modules/home.nix ];
|
imports = [./modules/home.nix];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -78,7 +83,7 @@
|
||||||
#placeholder
|
#placeholder
|
||||||
nixosConfigurations.phoenix = nixpkgs.lib.nixosSystem {
|
nixosConfigurations.phoenix = nixpkgs.lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
specialArgs = { inherit inputs; };
|
specialArgs = {inherit inputs;};
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/phoenix/configuration.nix
|
./hosts/phoenix/configuration.nix
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
|
|
@ -87,11 +92,11 @@
|
||||||
home-manager = {
|
home-manager = {
|
||||||
useGlobalPkgs = true;
|
useGlobalPkgs = true;
|
||||||
useUserPackages = true;
|
useUserPackages = true;
|
||||||
extraSpecialArgs = { inherit inputs nix-colors; };
|
extraSpecialArgs = {inherit inputs nix-colors;};
|
||||||
backupFileExtension = "backup";
|
backupFileExtension = "backup";
|
||||||
|
|
||||||
users.tulg = {
|
users.tulg = {
|
||||||
imports = [ ./modules/home.nix ];
|
imports = [./modules/home.nix];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,18 +1,18 @@
|
||||||
# Edit this configuration file to define what should be installed on
|
# Edit this configuration file to define what should be installed on
|
||||||
# your system. Help is available in the configuration.nix(5) man page
|
# your system. Help is available in the configuration.nix(5) man page
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||||
|
|
||||||
{ config, pkgs, self, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
config,
|
||||||
[ # Include the results of the hardware scan.
|
pkgs,
|
||||||
# ./disko.nix
|
self,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
imports = [
|
||||||
|
# Include the results of the hardware scan.
|
||||||
|
# ./disko.nix
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Bootloader.
|
# Bootloader.
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
@ -58,7 +58,7 @@
|
||||||
users.users.tulg = {
|
users.users.tulg = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "Tulga";
|
description = "Tulga";
|
||||||
extraGroups = [ "networkmanager" "network ""wheel" ];
|
extraGroups = ["networkmanager" "network " "wheel"];
|
||||||
packages = with pkgs; [];
|
packages = with pkgs; [];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -109,14 +109,13 @@
|
||||||
fontconfig = {
|
fontconfig = {
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultFonts = {
|
defaultFonts = {
|
||||||
sansSerif = [ "Fira Sans Regular" ];
|
sansSerif = ["Fira Sans Regular"];
|
||||||
serif = [ "Fira Sans Regular" ];
|
serif = ["Fira Sans Regular"];
|
||||||
monospace = [ "Fira Mono Regular" ];
|
monospace = ["Fira Mono Regular"];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
powerManagement.powertop.enable = true;
|
powerManagement.powertop.enable = true;
|
||||||
services = {
|
services = {
|
||||||
power-profiles-daemon.enable = false;
|
power-profiles-daemon.enable = false;
|
||||||
|
|
@ -149,8 +148,7 @@
|
||||||
# this value at the release version of the first install of this system.
|
# this value at the release version of the first install of this system.
|
||||||
# Before changing this value read the documentation for this option
|
# Before changing this value read the documentation for this option
|
||||||
# (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).
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes"];
|
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||||
services.displayManager.ly.enable = true;
|
services.displayManager.ly.enable = true;
|
||||||
system.stateVersion = "25.05"; # Did you read the comment?
|
system.stateVersion = "25.05"; # Did you read the comment?
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,20 @@
|
||||||
{ config, lib, pkgs, inputs, ... }:
|
{
|
||||||
|
config,
|
||||||
let
|
lib,
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
dots = "${config.home.homeDirectory}/nixdots/config";
|
dots = "${config.home.homeDirectory}/nixdots/config";
|
||||||
symlink = path: config.lib.file.mkOutOfStoreSymlink path;
|
symlink = path: config.lib.file.mkOutOfStoreSymlink path;
|
||||||
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.system};
|
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.system};
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
imports = [
|
imports = [
|
||||||
inputs.zen-browser.homeModules.twilight
|
inputs.zen-browser.homeModules.twilight
|
||||||
inputs.spicetify-nix.homeManagerModules.default
|
inputs.spicetify-nix.homeManagerModules.default
|
||||||
|
|
||||||
];
|
];
|
||||||
# Home Manager settings
|
# Home Manager settings
|
||||||
|
nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
|
||||||
home.username = "tulg";
|
home.username = "tulg";
|
||||||
home.homeDirectory = "/home/tulg";
|
home.homeDirectory = "/home/tulg";
|
||||||
home.stateVersion = "25.05";
|
home.stateVersion = "25.05";
|
||||||
|
|
@ -21,17 +24,19 @@ in
|
||||||
nwg-look
|
nwg-look
|
||||||
rose-pine-gtk-theme
|
rose-pine-gtk-theme
|
||||||
xfce.thunar
|
xfce.thunar
|
||||||
|
alejandra
|
||||||
arc-theme
|
arc-theme
|
||||||
tmux
|
tmux
|
||||||
fastfetch
|
fastfetch
|
||||||
btop
|
btop
|
||||||
# spotify
|
# spotify
|
||||||
pavucontrol
|
pavucontrol
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
hyprcursor
|
hyprcursor
|
||||||
parsec-bin
|
parsec-bin
|
||||||
file-roller
|
file-roller
|
||||||
hyprpolkitagent
|
hyprpolkitagent
|
||||||
|
pkgs.nixd
|
||||||
swww
|
swww
|
||||||
grim
|
grim
|
||||||
slurp
|
slurp
|
||||||
|
|
@ -94,12 +99,13 @@ in
|
||||||
|
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
a = "echo ids";
|
a = "echo ids";
|
||||||
|
rb = "nixos-rebuild switch --flake";
|
||||||
};
|
};
|
||||||
|
|
||||||
bashrcExtra = ''
|
bashrcExtra = ''
|
||||||
PS1="\[\e[38;5;177m\]\u\[\e[38;5;220m\]@\[\e[38;5;1m\]\h \[\e[38;5;33m\]\w \[\033[0m\]\$ "
|
PS1="\[\e[38;5;177m\]\u\[\e[38;5;220m\]@\[\e[38;5;1m\]\h \[\e[38;5;33m\]\w \[\033[0m\]\$ "
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -119,11 +125,8 @@ in
|
||||||
name = "Papirus-Dark";
|
name = "Papirus-Dark";
|
||||||
package = pkgs.papirus-icon-theme;
|
package = pkgs.papirus-icon-theme;
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
home.pointerCursor = {
|
home.pointerCursor = {
|
||||||
gtk.enable = true;
|
gtk.enable = true;
|
||||||
x11.enable = true;
|
x11.enable = true;
|
||||||
|
|
@ -146,7 +149,7 @@ in
|
||||||
GTK_THEME = "rose-pine";
|
GTK_THEME = "rose-pine";
|
||||||
QT_QPA_PLATFORMTHEME = "qt5ct";
|
QT_QPA_PLATFORMTHEME = "qt5ct";
|
||||||
QT_QPA_PLATFORM = "wayland";
|
QT_QPA_PLATFORM = "wayland";
|
||||||
# PS1="\[\e[38;5;177m\]\u\[\e[38;5;220m\]@\[\e[38;5;1m\]\h \[\e[38;5;33m\]\w \[\033[0m\]$ ";
|
# PS1="\[\e[38;5;177m\]\u\[\e[38;5;220m\]@\[\e[38;5;1m\]\h \[\e[38;5;33m\]\w \[\033[0m\]$ ";
|
||||||
};
|
};
|
||||||
|
|
||||||
xdg.portal = {
|
xdg.portal = {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue