Compare commits

...
12 Commits
Author SHA1 Message Date
Sweetbread 80f25abdd5 ags: add another accent for chest 2025-12-03 15:37:14 +03:00
Sweetbread 718d20da06 system: update channels 2025-12-03 15:37:14 +03:00
Sweetbread ce4e5e3d50 ref: remove host.laptop from user modules 2025-12-03 15:36:33 +03:00
Sweetbread 3835443178 sops: fix link 2025-12-03 15:36:33 +03:00
Sweetbread 47b17c70ad flake: add custom cache 2025-12-03 15:36:33 +03:00
Sweetbread bd810a6a2a hypr: change border color 2025-12-03 15:36:33 +03:00
Chest 6cf26a1e18 pkgs: add ZZZ 2025-12-03 15:36:33 +03:00
Chest b556847dcf Eclipse: add VirtualBox 2025-12-03 15:36:33 +03:00
Sweetbread 3f06268365 zsh: add more aliases 2025-12-03 15:36:32 +03:00
Sweetbread b02a17a7d9 boot: left os prober only for Impreza 2025-12-03 15:36:32 +03:00
Sweetbread 5ebffd5e41 flake: remove devshell 2025-12-03 15:36:32 +03:00
Sweetbread 0c9e6b31aa flake: remove host definition dublication 2025-12-03 15:36:22 +03:00
28 changed files with 107 additions and 162 deletions

No files matched your search

Generated
+10 -10
View File
@@ -683,34 +683,34 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-fixed": { "nixpkgs-pinned": {
"locked": { "locked": {
"lastModified": 1754292888, "lastModified": 1764517877,
"narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=", "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ce01daebf8489ba97bd1609d185ea276efdeb121", "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ce01daebf8489ba97bd1609d185ea276efdeb121", "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1763948260, "lastModified": 1764522689,
"narHash": "sha256-dY9qLD0H0zOUgU3vWacPY6Qc421BeQAfm8kBuBtPVE0=", "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c", "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -883,7 +883,7 @@
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprland-plugins": "hyprland-plugins", "hyprland-plugins": "hyprland-plugins",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"nixpkgs-fixed": "nixpkgs-fixed", "nixpkgs-pinned": "nixpkgs-pinned",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stylix": "stylix", "stylix": "stylix",
+18 -78
View File
@@ -3,26 +3,24 @@
nixConfig = { nixConfig = {
extra-substituters = [ extra-substituters = [
"https://nix.codrs.ru/main"
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
# "https://cache.garnix.io"
"https://hyprland.cachix.org" "https://hyprland.cachix.org"
"https://ezkea.cachix.org" "https://ezkea.cachix.org"
"https://risdeveau.cachix.org"
]; ];
extra-trusted-public-keys = [ extra-trusted-public-keys = [
"main:kpwMe+9BsGJ/IUb7i3iadaV38y5/Yuqoct0mf7wI9ds="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
# "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI=" "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI="
"risdeveau.cachix.org-1:TsoFSVeLl7iKtUYGX7qsvKPjf2vbNLfLC5v3SAdU8r0="
]; ];
}; };
inputs = { inputs = {
aagl.url = "github:ezKEa/aagl-gtk-on-nix"; aagl.url = "github:ezKEa/aagl-gtk-on-nix";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
nixpkgs-fixed.url = "github:nixos/nixpkgs/ce01daebf8489ba97bd1609d185ea276efdeb121"; nixpkgs-pinned.url = "github:nixos/nixpkgs/2d293cbfa5a793b4c50d17c05ef9e385b90edf6c";
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix";
ags.url = "github:Aylur/ags/3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6"; ags.url = "github:Aylur/ags/3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6";
@@ -40,81 +38,23 @@
}; };
}; };
outputs = { self, nixpkgs, nixpkgs-stable, nixpkgs-fixed, home-manager, ... }@inputs: let outputs = { self, nixpkgs, nixpkgs-stable, nixpkgs-pinned, home-manager, ... }@inputs: let
system = "x86_64-linux"; system = "x86_64-linux";
config = { allowUnfree = true; };
mkHost = hostname: nixpkgs.lib.nixosSystem {
specialArgs = {
inherit inputs;
pkgs-stable = import nixpkgs-stable { inherit system config; };
pkgs-pinned = import nixpkgs-pinned { 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
];
}; };
}; };
} }
+5 -6
View File
@@ -1,6 +1,4 @@
{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let { config, pkgs, pkgs-stable, pkgs-pinned, lib, inputs, ... }: {
laptop = false;
in {
imports = [ imports = [
./secrets/secrets.nix ./secrets/secrets.nix
./modules/aagl.nix ./modules/aagl.nix
@@ -17,11 +15,10 @@ in {
(import ../../user/common.nix { (import ../../user/common.nix {
inherit config; inherit config;
inherit pkgs; inherit pkgs;
inherit pkgs-unstable; inherit pkgs-stable;
inherit pkgs-fixed; inherit pkgs-pinned;
inherit lib; inherit lib;
inherit inputs; inherit inputs;
inherit laptop;
name = "chest"; name = "chest";
}) })
]; ];
@@ -29,4 +26,6 @@ in {
nixpkgs.config.allowBroken = true; nixpkgs.config.allowBroken = true;
programs.gamemode.enable = true; programs.gamemode.enable = true;
services.printing.enable = true; services.printing.enable = true;
virtualisation.virtualbox.host.enable = true;
users.extraGroups.vboxusers.members = [ "chest" ];
} }
+1
View File
@@ -2,6 +2,7 @@
imports = [ inputs.aagl.nixosModules.default ]; imports = [ inputs.aagl.nixosModules.default ];
nix.settings = inputs.aagl.nixConfig; # Set up Cachix nix.settings = inputs.aagl.nixConfig; # Set up Cachix
programs.honkers-railway-launcher.enable = true; programs.honkers-railway-launcher.enable = true;
programs.sleepy-launcher.enable = true;
networking.hosts."0.0.0.0" = [ networking.hosts."0.0.0.0" = [
"overseauspider.yuanshen.com" "overseauspider.yuanshen.com"
"log-upload-os.hoyoverse.com" "log-upload-os.hoyoverse.com"
+5 -7
View File
@@ -1,6 +1,4 @@
{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let { config, pkgs, pkgs-stable, pkgs-pinned, lib, inputs, ... }: {
laptop = true;
in {
imports = [ imports = [
./secrets/secrets.nix ./secrets/secrets.nix
./modules/grub.nix ./modules/grub.nix
@@ -15,17 +13,17 @@ in {
(import ../../user/common.nix { (import ../../user/common.nix {
inherit config; inherit config;
inherit pkgs; inherit pkgs;
inherit pkgs-unstable; inherit pkgs-stable;
inherit pkgs-fixed; inherit pkgs-pinned;
inherit lib; inherit lib;
inherit inputs; inherit inputs;
inherit laptop;
name = "chest"; name = "chest";
}) })
]; ];
nix.settings.cores = 3;
nixpkgs.config.allowBroken = true; nixpkgs.config.allowBroken = true;
programs.gamemode.enable = true; programs.gamemode.enable = true;
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
host.laptop = laptop; host.laptop = true;
} }
+2
View File
@@ -41,4 +41,6 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
boot.loader.grub.useOSProber = true;
} }
+3 -6
View File
@@ -1,6 +1,4 @@
{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let { config, pkgs, pkgs-stable, pkgs-pinned, lib, inputs, ... }: {
laptop = false;
in {
imports = [ imports = [
./secrets/secrets.nix ./secrets/secrets.nix
./modules/grub.nix ./modules/grub.nix
@@ -17,11 +15,10 @@ in {
(import ../../user/common.nix { (import ../../user/common.nix {
inherit config; inherit config;
inherit pkgs; inherit pkgs;
inherit pkgs-unstable; inherit pkgs-stable;
inherit pkgs-fixed; inherit pkgs-pinned;
inherit lib; inherit lib;
inherit inputs; inherit inputs;
inherit laptop;
name = "sweetbread"; name = "sweetbread";
fullname = "Sweet Bread"; fullname = "Sweet Bread";
}) })
+4 -7
View File
@@ -1,6 +1,4 @@
{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let { config, pkgs, pkgs-stable, pkgs-pinned, lib, inputs, ... }: {
laptop = true;
in {
imports = [ imports = [
./secrets/secrets.nix ./secrets/secrets.nix
./modules/grub.nix ./modules/grub.nix
@@ -15,18 +13,17 @@ in {
(import ../../user/common.nix { (import ../../user/common.nix {
inherit config; inherit config;
inherit pkgs; inherit pkgs;
inherit pkgs-unstable; inherit pkgs-stable;
inherit pkgs-fixed; inherit pkgs-pinned;
inherit lib; inherit lib;
inherit inputs; inherit inputs;
inherit laptop;
name = "sweetbread"; name = "sweetbread";
fullname = "Sweet Bread"; fullname = "Sweet Bread";
}) })
]; ];
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
host.laptop = laptop; host.laptop = true;
environment.systemPackages = [ pkgs.dbgate ]; environment.systemPackages = [ pkgs.dbgate ];
} }
+1 -1
View File
@@ -4,7 +4,7 @@
secrets = { secrets = {
vpn_bolt = { vpn_bolt = {
format = "binary"; format = "binary";
sopsFile = ./vpn_bolt.db; sopsFile = ../../Rias/secrets/vpn_bolt.db;
}; };
}; };
}; };
-1
View File
@@ -1 +0,0 @@
../../Rias/secrets/vpn_bolt.db
+6 -1
View File
@@ -11,10 +11,15 @@
}; };
config = { config = {
nix.settings = {
keep-going = true;
extra-substituters = [ "https://nix.codrs.ru/main" ];
extra-trusted-public-keys = [ "main:kpwMe+9BsGJ/IUb7i3iadaV38y5/Yuqoct0mf7wI9ds=" ];
experimental-features = [ "nix-command" "flakes" ];
};
networking.hostName = hostname; networking.hostName = hostname;
time.timeZone = lib.mkDefault "Europe/Moscow"; time.timeZone = lib.mkDefault "Europe/Moscow";
i18n.defaultLocale = lib.mkDefault "ru_RU.UTF-8"; i18n.defaultLocale = lib.mkDefault "ru_RU.UTF-8";
nix.settings.experimental-features = [ "nix-command" "flakes" ];
system.stateVersion = "23.05"; system.stateVersion = "23.05";
}; };
} }
+6 -6
View File
@@ -1,22 +1,22 @@
{ config, pkgs, ... }: { config, pkgs-stable, ... }:
{ {
hardware.graphics = { hardware.graphics = {
enable = true; enable = true;
extraPackages = with pkgs; [ extraPackages = with pkgs-stable; [
intel-media-driver intel-media-driver
intel-compute-runtime intel-compute-runtime
libvdpau-va-gl libvdpau-va-gl
]; ];
extraPackages32 = with pkgs.pkgsi686Linux; [ extraPackages32 = with pkgs-stable.pkgsi686Linux; [
intel-media-driver intel-media-driver
]; ];
}; };
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config.packageOverrides = pkgs-stable: {
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; vaapiIntel = pkgs-stable.vaapiIntel.override { enableHybridCodec = true; };
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs-stable; [
intel-gpu-tools intel-gpu-tools
libva-utils libva-utils
clinfo clinfo
+3 -3
View File
@@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }: { { config, pkgs-stable, lib, ... }: {
boot.kernelParams = [ "nvidia-drm.modeset=1" ]; boot.kernelParams = [ "nvidia-drm.modeset=1" ];
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [ "nvidia" ];
@@ -6,12 +6,12 @@
graphics = { graphics = {
enable = true; enable = true;
enable32Bit = true; enable32Bit = true;
extraPackages = with pkgs; [ extraPackages = with pkgs-stable; [
nvidia-vaapi-driver nvidia-vaapi-driver
intel-media-driver intel-media-driver
libvdpau-va-gl libvdpau-va-gl
]; ];
extraPackages32 = with pkgs.pkgsi686Linux; [nvidia-vaapi-driver intel-media-driver]; extraPackages32 = with pkgs-stable.pkgsi686Linux; [nvidia-vaapi-driver intel-media-driver];
}; };
nvidia = { nvidia = {
+3 -3
View File
@@ -1,7 +1,7 @@
{ pkgs-unstable, inputs, ... }: { { pkgs, inputs, ... }: {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
environment.systemPackages = with pkgs-unstable; [ environment.systemPackages = with pkgs; [
file file
tree tree
wget wget
@@ -20,7 +20,7 @@
fonts = { fonts = {
enableDefaultPackages = false; enableDefaultPackages = false;
packages = with pkgs-unstable; [ packages = with pkgs; [
jetbrains-mono # Best mono font jetbrains-mono # Best mono font
noto-fonts-cjk-sans # Japanese noto-fonts-cjk-sans # Japanese
powerline-symbols # Console decoration powerline-symbols # Console decoration
-1
View File
@@ -11,7 +11,6 @@
enable = true; enable = true;
efiSupport = true; efiSupport = true;
device = "nodev"; device = "nodev";
useOSProber = true;
}; };
}; };
consoleLogLevel = 0; consoleLogLevel = 0;
+2 -2
View File
@@ -1,4 +1,4 @@
{ config, pkgs, pkgs-unstable, lib, ... }: { config, pkgs, lib, ... }:
lib.mkIf config.programs.gamemode.enable { lib.mkIf config.programs.gamemode.enable {
programs.steam = { programs.steam = {
@@ -8,7 +8,7 @@ lib.mkIf config.programs.gamemode.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
mangohud mangohud
protonup protonup-ng
bottles bottles
heroic heroic
prismlauncher prismlauncher
+1 -1
View File
@@ -1,4 +1,4 @@
{ pkgs, ...}: { {
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;
+1 -1
View File
@@ -1,7 +1,7 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
let let
sol = pkgs.writers.writePython3 "shutdown-on-lan.py" { sol = pkgs.writers.writePython3 "shutdown-on-lan.py" {
libraries = [ pkgs.python312Packages.psutil ]; libraries = [ pkgs.python313Packages.psutil ];
flakeIgnore = [ "E302" "E305" "E501" "E701" ]; flakeIgnore = [ "E302" "E305" "E501" "E701" ];
} /*py*/ '' } /*py*/ ''
# https://habr.com/ru/articles/816765/ # https://habr.com/ru/articles/816765/
+1 -1
View File
@@ -1,4 +1,4 @@
{ pkgs, ... }: { {
virtualisation.libvirtd.enable = true; virtualisation.libvirtd.enable = true;
programs.virt-manager.enable = true; programs.virt-manager.enable = true;
} }
+2 -2
View File
@@ -1,11 +1,11 @@
{ pkgs, pkgs-unstable, config, ...}: { { pkgs, config, ... }: {
systemd.services.v2raya = { systemd.services.v2raya = {
enable = true; enable = true;
description = "v2rayA gui client"; description = "v2rayA gui client";
after = [ "network.target" ]; after = [ "network.target" ];
serviceConfig = { serviceConfig = {
Restart = "always"; Restart = "always";
ExecStart = "${pkgs-unstable.v2raya}/bin/v2rayA"; ExecStart = "${pkgs.v2raya}/bin/v2rayA";
}; };
path = with pkgs; [ iptables bash iproute2 ]; path = with pkgs; [ iptables bash iproute2 ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
+2 -2
View File
@@ -1,4 +1,4 @@
{ config, inputs, pkgs, ... }: { { config, inputs, pkgs, username, ... }: {
imports = [ inputs.ags.homeManagerModules.default ]; imports = [ inputs.ags.homeManagerModules.default ];
programs.ags = { programs.ags = {
@@ -22,5 +22,5 @@
wayland.windowManager.hyprland.settings.exec-once = [ "ags run" ]; wayland.windowManager.hyprland.settings.exec-once = [ "ags run" ];
xdg.configFile."ags".source = (pkgs.callPackage ./packages/drvs/ags.nix { colors = config.lib.stylix.colors; }); xdg.configFile."ags".source = (pkgs.callPackage ./packages/drvs/ags.nix { inherit username; colors = config.lib.stylix.colors; });
} }
+3 -3
View File
@@ -1,7 +1,7 @@
{ pkgs-fixed, lib, host, ... }: { pkgs-pinned, lib, osConfig, ... }:
lib.mkIf (!host.laptop) { lib.mkIf (!osConfig.host.laptop) {
home.packages = with pkgs-fixed; [ home.packages = with pkgs-pinned; [
(blender.override { cudaSupport = true; }) (blender.override { cudaSupport = true; })
aseprite aseprite
krita krita
+2 -2
View File
@@ -1,6 +1,6 @@
{ pkgs, inputs, pkgs-fixed, ... }: { { pkgs, pkgs-pinned, inputs, ... }: {
home.packages = with pkgs; [ home.packages = with pkgs; [
pkgs-fixed.ayugram-desktop pkgs-pinned.ayugram-desktop
vesktop vesktop
obs-studio obs-studio
mpv mpv
+8 -4
View File
@@ -1,17 +1,21 @@
{ stdenv, lib, config, colors, ... }: { stdenv, lib, config, colors, username, ... }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "AGS theme"; name = "AGS theme";
src = ./ags; src = ./ags;
dontUnpack = true; dontUnpack = true;
patchPhase = '' patchPhase = let
accent = if username == "chest"
then colors.base0E
else colors.base0B;
in ''
echo \$bg: \#${colors.base00}\; > colors.scss echo \$bg: \#${colors.base00}\; > colors.scss
echo \$surface0: \#${colors.base02}\; >> colors.scss echo \$surface0: \#${colors.base02}\; >> colors.scss
echo \$fg: \#${colors.base05}\; >> colors.scss echo \$fg: \#${colors.base05}\; >> colors.scss
echo \$accent: \#${colors.base0B}\; >> colors.scss echo \$accent: \#${accent}\; >> colors.scss
echo \#${colors.base0B} > accent.css echo \#${accent} > accent.css
''; '';
installPhase = '' installPhase = ''
+2
View File
@@ -55,11 +55,13 @@
flakeDir = "~/nix"; flakeDir = "~/nix";
in { in {
rb = "nh os switch ${flakeDir}"; rb = "nh os switch ${flakeDir}";
trb = "nh os test ${flakeDir}";
upd = "nix flake update --flake ${flakeDir}"; upd = "nix flake update --flake ${flakeDir}";
cat = "${pkgs.lib.getExe pkgs.bat}"; cat = "${pkgs.lib.getExe pkgs.bat}";
cd = "z"; cd = "z";
lg = "lazygit"; lg = "lazygit";
s = "nix-shell . --run zsh";
}; };
initContent = '' initContent = ''
+2 -2
View File
@@ -1,4 +1,4 @@
{ pkgs, pkgs-fixed, host, ... }: { { pkgs, pkgs-pinned, host, ... }: {
imports = [ imports = [
../../modules/user/packages/cs_utils.nix ../../modules/user/packages/cs_utils.nix
]; ];
@@ -10,7 +10,7 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
nautilus nautilus
python3 python3
pkgs-fixed.jetbrains.pycharm-community pkgs-pinned.jetbrains.pycharm-community
aseprite aseprite
krita krita
google-chrome google-chrome
+1 -1
View File
@@ -7,7 +7,7 @@
gaps_in = 5; gaps_in = 5;
gaps_out = 5; gaps_out = 5;
border_size = 2; border_size = 2;
"col.active_border" = "rgba(${colors.base0C}ee) rgba(${colors.base0B}ee) 45deg"; "col.active_border" = "rgba(${colors.base0E}ee) rgba(${colors.base0C}ee) 45deg";
"col.inactive_border" = "rgba(${colors.base05}aa)"; "col.inactive_border" = "rgba(${colors.base05}aa)";
layout = "dwindle"; layout = "dwindle";
+13 -11
View File
@@ -1,8 +1,16 @@
{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, laptop, name, fullname ? name, ... }: { { config
, pkgs
, pkgs-stable
, pkgs-pinned
, lib
, inputs
, name
, fullname ? name
}: {
imports = [ imports = [
inputs.home-manager.nixosModules.home-manager { inputs.home-manager.nixosModules.home-manager {
home-manager = { home-manager = {
useGlobalPkgs = false; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
backupFileExtension = "rebuild"; backupFileExtension = "rebuild";
overwriteBackup = true; overwriteBackup = true;
@@ -22,18 +30,12 @@
homeDirectory = "/home/${name}"; homeDirectory = "/home/${name}";
stateVersion = "23.11"; stateVersion = "23.11";
}; };
_module.args.pkgs = lib.mkForce pkgs-unstable;
}; };
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs; inherit inputs;
pkgs-stable = pkgs; inherit pkgs-stable;
inherit pkgs-fixed; inherit pkgs-pinned;
host = {
laptop = laptop;
name = config.networking.hostName;
};
username = name; username = name;
}; };
}; };
@@ -53,7 +55,7 @@
}; };
services.greetd = let services.greetd = let
tuigreet = lib.getExe pkgs.greetd.tuigreet; tuigreet = lib.getExe pkgs.tuigreet;
session = lib.getExe inputs.hyprland.packages.${pkgs.system}.default; session = lib.getExe inputs.hyprland.packages.${pkgs.system}.default;
in { in {
enable = true; enable = true;