Compare commits

..
5 Commits
Author SHA1 Message Date
Sweetbread d9bd0b366b flake: remove devshell 2025-11-29 16:21:49 +03:00
Sweetbread d46c82e801 flake: remove host definition dublication 2025-11-29 16:21:49 +03:00
Sweetbread 681c5f3a27 zsh: config history 2025-11-29 16:21:49 +03:00
Sweetbread 1969506bda zsh: optimise aliases 2025-11-29 16:21:49 +03:00
Sweetbread 52c73251a9 hyprland: separate settings for user and host 2025-11-29 16:21:14 +03:00
4 changed files with 41 additions and 86 deletions

No files matched your search

+18 -71
View File
@@ -2,6 +2,8 @@
description = "My system configuration"; description = "My system configuration";
nixConfig = { nixConfig = {
allowUnfree = true;
extra-substituters = [ extra-substituters = [
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
# "https://cache.garnix.io" # "https://cache.garnix.io"
@@ -42,79 +44,24 @@
outputs = { self, nixpkgs, nixpkgs-stable, nixpkgs-fixed, home-manager, ... }@inputs: let outputs = { self, nixpkgs, nixpkgs-stable, nixpkgs-fixed, home-manager, ... }@inputs: let
system = "x86_64-linux"; system = "x86_64-linux";
config = { allowUnfree = true; };
mkHost = hostname: nixpkgs-stable.lib.nixosSystem {
specialArgs = {
inherit
inputs
system
;
pkgs-unstable = import nixpkgs { inherit system config; };
pkgs-fixed = import nixpkgs-fixed { inherit system config; };
};
modules = [ ./host/${hostname}/configuration.nix ];
};
in { in {
nixosConfigurations = { nixosConfigurations = {
Rias = nixpkgs-stable.lib.nixosSystem { Rias = mkHost "Rias";
specialArgs = { Senko = mkHost "Senko";
pkgs-unstable = import nixpkgs { Eclipse = mkHost "Eclipse";
inherit system; Impreza = mkHost "Impreza";
config.allowUnfree = true;
};
pkgs-fixed = import nixpkgs-fixed {
inherit system;
config.allowUnfree = true;
};
inherit inputs system;
};
modules = [ ./host/Rias/configuration.nix ];
};
Senko = nixpkgs-stable.lib.nixosSystem {
specialArgs = {
pkgs-unstable = import nixpkgs {
inherit system;
config.allowUnfree = true;
};
pkgs-fixed = import nixpkgs-fixed {
inherit system;
config.allowUnfree = true;
};
inherit inputs system;
};
modules = [ ./host/Senko/configuration.nix ];
};
Eclipse = nixpkgs-stable.lib.nixosSystem {
specialArgs = {
pkgs-unstable = import nixpkgs {
inherit system;
config.allowUnfree = true;
};
pkgs-fixed = import nixpkgs-fixed {
inherit system;
config.allowUnfree = true;
};
inherit inputs system;
};
modules = [ ./host/Eclipse/configuration.nix ];
};
Impreza = nixpkgs-stable.lib.nixosSystem {
specialArgs = {
pkgs-unstable = import nixpkgs {
inherit system;
config.allowUnfree = true;
};
pkgs-fixed = import nixpkgs-fixed {
inherit system;
config.allowUnfree = true;
};
inherit inputs system;
};
modules = [ ./host/Impreza/configuration.nix ];
};
};
devShells."${system}".default = let
pkgs = import nixpkgs { inherit system; };
in pkgs.mkShell {
shellHook = "zsh";
packages = with pkgs; [
cargo
rustc
rust-analyzer
lldb
];
}; };
}; };
} }
+15
View File
@@ -0,0 +1,15 @@
{
wayland.windowManager.hyprland = {
settings = {
monitor = [
"DP-3 , 1920x1080@165, 0x0 , 1"
"HDMI-A-1, preferred , -1080x0, 1, transform, 1"
];
workspace = [
"1, monitor:DP-3, default:true"
"10, monitor:HDMI-A-1, default:true"
];
};
};
}
+1 -1
View File
@@ -1,4 +1,4 @@
{ pkgs, lib, ...}: { {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
settings = { settings = {
monitor = [ monitor = [
+7 -14
View File
@@ -51,23 +51,12 @@
autosuggestion.enable = true; autosuggestion.enable = true;
syntaxHighlighting.enable = true; syntaxHighlighting.enable = true;
shellAliases = shellAliases = let
let
flakeDir = "~/nix"; flakeDir = "~/nix";
in { in {
rb = "nh os switch ${flakeDir}"; rb = "nh os switch ${flakeDir}";
upd = "nix flake update --flake ${flakeDir}"; upd = "nix flake update --flake ${flakeDir}";
upg = "sudo nixos-rebuild switch --upgrade --flake ${flakeDir}";
hms = "nh home switch ${flakeDir}";
rhms = ''${pkgs.bash} $(home-manager generations | fzf | awk -F '-> ' '{print $2 "/activate"}')''; #https://github.com/nix-community/home-manager/issues/1114#issuecomment-2067785129
conf = "$EDITOR ${flakeDir}/nixos/hosts/$(hostname)/configuration.nix";
pkgs = "$EDITOR ${flakeDir}/nixos/packages.nix";
ll = "ls -l";
se = "sudoedit";
ff = "fastfetch";
cat = "${pkgs.lib.getExe pkgs.bat}"; cat = "${pkgs.lib.getExe pkgs.bat}";
cd = "z"; cd = "z";
lg = "lazygit"; lg = "lazygit";
@@ -84,8 +73,12 @@
TERM=xterm-256color TERM=xterm-256color
''; '';
history.size = 10000; history = {
history.path = "${config.xdg.dataHome}/zsh/history"; size = 10000;
path = "${config.xdg.dataHome}/zsh/history";
expireDuplicatesFirst = true;
ignoreDups = true;
};
oh-my-zsh.enable = true; oh-my-zsh.enable = true;
}; };