This commit is contained in:
m3tam3re 2023-04-07 06:09:28 +02:00
parent e78f011441
commit 4908eeb0a5
5 changed files with 240 additions and 171 deletions

View File

@ -19,6 +19,22 @@
"type": "github"
}
},
"base16-schemes": {
"flake": false,
"locked": {
"lastModified": 1665690101,
"narHash": "sha256-J2ZvNaVFkqaTXzYO5L+jyRORfIOavFPKvWItP6UTMKs=",
"owner": "tinted-theming",
"repo": "base16-schemes",
"rev": "a3dc916cf90471a422c0bfe1bb4b1bdd12185ced",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-schemes",
"type": "github"
}
},
"darwin": {
"inputs": {
"nixpkgs": [
@ -140,6 +156,25 @@
"type": "github"
}
},
"nix-colors": {
"inputs": {
"base16-schemes": "base16-schemes",
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1672236234,
"narHash": "sha256-dpBIuxcDEvJbLD8fTipE0A0JbQD1lZB94zYFPoh01PI=",
"owner": "misterio77",
"repo": "nix-colors",
"rev": "7e459f1d88ac54fc2f4b308adb5064863006e4b1",
"type": "github"
},
"original": {
"owner": "misterio77",
"repo": "nix-colors",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1677676435,
@ -156,6 +191,21 @@
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1655599917,
"narHash": "sha256-kjZbt5WdTrnjMxL79okg9TCoRUdADG50x/TWozbyTsE=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "5fb55578aa2f1a502d636a8ac71aece57cb730bb",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1679865578,
@ -226,6 +276,7 @@
"deploy-rs": "deploy-rs",
"home-manager": "home-manager",
"hyprland": "hyprland",
"nix-colors": "nix-colors",
"nixpkgs": "nixpkgs_4",
"nixpkgs-unstable": "nixpkgs-unstable"
}

View File

@ -13,9 +13,10 @@
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
deploy-rs.url = "github:serokell/deploy-rs";
hyprland.url = "github:hyprwm/Hyprland";
nix-colors.url = "github:misterio77/nix-colors";
};
outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, hyprland
outputs = { self, nix-colors, nixpkgs, nixpkgs-unstable, home-manager, hyprland
, agenix, deploy-rs, ... }@inputs:
let
inherit (self) outputs;
@ -78,7 +79,7 @@
# Laptop
"m3tam3re@m3-nix" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages."x86_64-linux";
extraSpecialArgs = { inherit inputs;
extraSpecialArgs = { inherit inputs nix-colors;
};
modules = [
./home/users/m3tam3re/m3-nix.nix

View File

@ -1,9 +1,9 @@
{ pkgs, lib, outputs, ... }:
{ pkgs, lib, outputs, nix-colors, ... }:
{
imports = [
./crypto.nix
./design.nix
./espanso.nix
# ./espanso.nix
./hyprland
./i3-gaps.nix
./extrafonts.nix
@ -13,9 +13,11 @@
./qt.nix
./rofi.nix
./syncthing.nix
nix-colors.homeManagerModule
];
xdg.mimeApps.enable = true;
colorScheme = nix-colors.colorSchemes.dracula;
home.sessionVariables = {
WEBKIT_DISABLE_COMPOSITING_MODE = "1";
@ -47,6 +49,7 @@
libnotify
lxappearance
nyxt
pamixer
pasystray
pavucontrol
picom

View File

@ -1,8 +1,12 @@
{ home, colorscheme, wallpaper }:
let inherit (home.sessionVariables) TERMINAL BROWSER EDITOR;
{ home, ... }:
let
inherit (home.sessionVariables) TERMINAL BROWSER EDITOR;
in ''
monitor=eDP-1,preferred, 2560x0, auto
monitor=DP-2,preferred, 0x0, auto
exec-once = hyprpaper
exec-once = waybar
exec-once = wl-paste -p -t text --watch clipman store -P --histpath="~/.local/share/clipman-primary.json"
# Source a file (multi-file configs)

View File

@ -1,8 +1,18 @@
{ inputs, config, lib, pkgs, ... }: {
imports = [ inputs.hyprland.homeManagerModules.default ];
programs = {
fish.loginShellInit = ''
if test (tty) = "/dev/tty1"
exec Hyprland &> /dev/null
end
'';
};
wayland.windowManager.hyprland = {
enable = true;
nvidiaPatches = true;
extraConfig =
(import ./config.nix { inherit (config) home; });
};
programs.waybar.package = pkgs.waybar.overrideAttrs
(oa: { mesonFlags = (oa.mesonFlags or [ ]) ++ [ "-Dexperimental=true" ]; });