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