Compare commits

..

2 Commits

Author SHA1 Message Date
07ab9c2c80 Flake update and nvd
Some checks failed
pre-commit / pre-commit (push) Failing after 15s
2024-04-22 22:35:36 +02:00
d0faa61427 Fix gunter stuff 2024-04-22 22:34:14 +02:00
9 changed files with 98 additions and 15 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
result

View File

@ -74,11 +74,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1713537308,
"narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=",
"lastModified": 1713714899,
"narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f",
"rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
"type": "github"
},
"original": {
@ -90,11 +90,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1713564160,
"narHash": "sha256-YguPZpiejgzLEcO36/SZULjJQ55iWcjAmf3lYiyV1Fo=",
"lastModified": 1713725259,
"narHash": "sha256-9ZR/Rbx5/Z/JZf5ehVNMoz/s5xjpP0a22tL6qNvLt5E=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "bc194f70731cc5d2b046a6c1b3b15f170f05999c",
"rev": "a5e4bbcb4780c63c79c87d29ea409abf097de3f7",
"type": "github"
},
"original": {
@ -171,11 +171,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1713668495,
"narHash": "sha256-4BvlfPfyUmB1U0r/oOF6jGEW/pG59c5yv6PJwgucTNM=",
"lastModified": 1713775152,
"narHash": "sha256-xyP8h9jLQ0AmyPy40sIwL7/D03oVpXG9YHoYJ4ecYWA=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "09f1bc8ba3277c0f052f7887ec92721501541938",
"rev": "4371a1301c4d36cc791069d90ae522613a3a335e",
"type": "github"
},
"original": {

View File

@ -1,4 +1,8 @@
{ inputs, pkgs, lib, config, ... }: {
imports = [
./hyprlock.nix
./hypridle.nix
];
options.hyprland.enable = lib.mkEnableOption "Hyprland";
config = {
home.packages = with pkgs; [
@ -122,6 +126,9 @@
# term
"$mainMod,Return,exec,$term"
# hyprlock
"$shiftMainMod,l,exec,hyprlock"
# rofi
"$mainMod,D,exec,rofi-launcher"
"$mainMod,P,exec,rofi-rbw"
@ -166,6 +173,7 @@
"waybar"
"hyprpaper & sleep 2 && randomwp"
"easyeffects --gapplication-service"
"hypridle"
# "dunst"
];
};

View File

@ -1,11 +1,11 @@
{ config, pkgs, ... }: {
{ config, osConfig, pkgs, ... }: {
home.packages = with pkgs; [
unstable.hyprlock
];
xdg.configFile = {
"hypr/hyprlock.conf" = {
source = config.lib.file.mkOutOfStoreSymlink ./. + "/hyprlock.conf";
source = config.lib.file.mkOutOfStoreSymlink ./. + "/hyprlock_${osConfig.system.name}.conf";
target = "hypr/hyprlock.conf";
};
};

View File

@ -0,0 +1,64 @@
source = ~/.cache/wal/colors-hyprland.conf
# BACKGROUND
background {
monitor =
path = ~/wallpapers/current
blur_passes = 3
contrast = 0.8916
brightness = 0.8172
vibrancy = 0.1696
vibrancy_darkness = 0.0
}
# GENERAL
general {
no_fade_in = false
grace = 0
disable_loading_bar = true
}
# INPUT FIELD
input-field {
monitor =
size = 250, 60
outline_thickness = 2
dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0
dots_center = true
outer_color = rgba(0, 0, 0, 0)
inner_color = rgba(0, 0, 0, 0.5)
font_color = rgb(200, 200, 200)
fade_on_empty = false
font_family = JetBrains Mono Nerd Font Mono
placeholder_text = <i><span foreground="##cdd6f4">Input Password...</span></i>
hide_input = false
position = 0, -120
halign = center
valign = center
}
# TIME
label {
monitor =
text = cmd[update:1000] echo "$(date +"%b %d %H:%M")"
color = $foreground
#color = rgba(255, 255, 255, 0.6)
font_size = 120
font_family = JetBrains Mono Nerd Font Mono ExtraBold
position = 0, -300
halign = center
valign = top
}
## USER
#label {
# monitor =
# text = Hi there, $USER
# color = $foreground
# #color = rgba(255, 255, 255, 0.6)
# font_size = 25
# font_family = JetBrains Mono Nerd Font Mono
# position = 0, -40
# halign = center
# valign = center
#}

View File

@ -1,4 +1,4 @@
{ pkgs, lib, ... }:
{ pkgs, lib, osConfig, ... }:
let
flakestat = pkgs.writeShellApplication {
name = "flakestat";
@ -155,7 +155,15 @@ in
modules-left = [ "custom/launcher" "hyprland/workspaces" ];
modules-center = [ "clock" ];
modules-right =
[ "custom/flakestat" "pulseaudio" "pulseaudio#microphone" "memory" "cpu" "tray" "battery" ];
[
"custom/flakestat"
"pulseaudio"
"pulseaudio#microphone"
"memory"
"cpu"
"tray"
(lib.mkIf (osConfig.system.name == "magicman") "battery")
];
"custom/launcher" = {
"format" = " ";
"on-click" = "pkill rofi || ~/.config/rofi/launcher.sh";

View File

@ -30,6 +30,7 @@ in
nwg-look
mumble
mpv
nvd
pamixer
pinentry
pre-commit

View File

@ -1,4 +1,4 @@
{ config, inputs, pkgs, ... }:
{ config, lib, inputs, pkgs, ... }:
{
imports = [
@ -124,6 +124,7 @@
wget
v4l-utils
nmap
(lib.mkIf (config.system.name == "gunter") pciutils)
# X shit
# xorg.xorgserver