torjus/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Format using nixfmt

Browse Source
This commit is contained in:
Torjus Håkestad
2024-07-17 22:22:04 +02:00
parent a85c6f2f4b
commit 90ccaa07bd
54 changed files with 671 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
home/hyprland/cursor.nix
View File

@@ -1,4 +1,5 @@
{ pkgs, ... }: {
{ pkgs, ... }:
{
home.pointerCursor = {
gtk.enable = true;
# x11.enable = true;

9
home/hyprland/gunter.nix
View File

@@ -1 +1,8 @@
{ imports = [ ./hyprland_gunter.nix ./waybar ./xdg.nix ./cursor.nix ]; }
{
imports = [
./hyprland_gunter.nix
./waybar
./xdg.nix
./cursor.nix
];
}

12
home/hyprland/hypridle.nix
View File

@@ -1,8 +1,12 @@
{ config, osConfig, pkgs, ... }: {
{
config,
osConfig,
pkgs,
...
}:
{
home.packages = with pkgs; [
hypridle
];
home.packages = with pkgs; [ hypridle ];
xdg.configFile = {
"hypr/hypridle.conf" = {
source = config.lib.file.mkOutOfStoreSymlink ./. + "/hypridle_${osConfig.system.name}.conf";

13
home/hyprland/hyprland_gunter.nix
View File

@@ -1,4 +1,11 @@
{ inputs, pkgs, lib, config, ... }: {
{
inputs,
pkgs,
lib,
config,
...
}:
{
imports = [
./hyprlock.nix
./hypridle.nix
@@ -121,9 +128,7 @@
"special:special, on-created-empty:kitty, rounding:true, decorate:false, border:false"
];
bindm = [
"ALT,mouse:272,movewindow"
];
bindm = [ "ALT,mouse:272,movewindow" ];
bindr = [
# mumble ptt release

21
home/hyprland/hyprland_magicman.nix
View File

@@ -1,4 +1,11 @@
{ inputs, pkgs, lib, config, ... }: {
{
inputs,
pkgs,
lib,
config,
...
}:
{
imports = [
./hyprlock.nix
./hypridle.nix
@@ -30,17 +37,13 @@
"$shiftMainMod" = "SUPER_SHIFT";
"$term" = "kitty";
monitor = [
"eDP-1,1920x1080@60,0x0,1"
];
monitor = [ "eDP-1,1920x1080@60,0x0,1" ];
input = {
kb_layout = "no";
follow_mouse = 1;
};
env = [
"XDG_SESSION_TYPE,wayland"
];
env = [ "XDG_SESSION_TYPE,wayland" ];
decoration = {
rounding = 10;
@@ -97,9 +100,7 @@
"special:special, on-created-empty:kitty, rounding:true, decorate:false, border:false"
];
bindm = [
"ALT,mouse:272,movewindow"
];
bindm = [ "ALT,mouse:272,movewindow" ];
bindr = [
# mumble ptt release

21
home/hyprland/hyprland_prismo.nix
View File

@@ -1,4 +1,11 @@
{ inputs, pkgs, lib, config, ... }: {
{
inputs,
pkgs,
lib,
config,
...
}:
{
options.hyprland.enable = lib.mkEnableOption "Hyprland";
config = {
home.packages = with pkgs; [
@@ -26,17 +33,13 @@
"$shiftMainMod" = "SUPER_SHIFT";
"$term" = "kitty";
monitor = [
];
monitor = [ ];
input = {
kb_layout = "no";
follow_mouse = 1;
};
env = [
"XDG_SESSION_TYPE,wayland"
];
env = [ "XDG_SESSION_TYPE,wayland" ];
decoration = {
rounding = 0;
@@ -92,9 +95,7 @@
"name:main 2, monitor:$mon_center, persistent:true, default:true"
];
bindm = [
"ALT,mouse:272,movewindow"
];
bindm = [ "ALT,mouse:272,movewindow" ];
bindr = [
# mumble ptt release

12
home/hyprland/hyprlock.nix
View File

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

9
home/hyprland/magicman.nix
View File

@@ -1 +1,8 @@
{ imports = [ ./hyprland_magicman.nix ./waybar ./xdg.nix ./cursor.nix ]; }
{
imports = [
./hyprland_magicman.nix
./waybar
./xdg.nix
./cursor.nix
];
}

9
home/hyprland/prismo.nix
View File

@@ -1 +1,8 @@
{ imports = [ ./hyprland_prismo.nix ./waybar ./xdg.nix ./cursor.nix ]; }
{
imports = [
./hyprland_prismo.nix
./waybar
./xdg.nix
./cursor.nix
];
}

54
home/hyprland/waybar/default.nix
View File

@@ -1,4 +1,9 @@
{ pkgs, lib, osConfig, ... }:
{
pkgs,
lib,
osConfig,
...
}:
let
flakestat = pkgs.writeShellApplication {
name = "flakestat";
@@ -11,9 +16,7 @@ let
arrhist = pkgs.stdenv.mkDerivation {
name = "arrhist";
propagatedBuildInputs = [
(pkgs.python3.withPackages (pythonPackages: with pythonPackages; [
requests
]))
(pkgs.python3.withPackages (pythonPackages: with pythonPackages; [ requests ]))
];
src = ./arrhist.py;
dontUnpack = true;
@@ -29,13 +32,14 @@ in
sops.secrets."radarr_api_key" = { };
xdg.configFile."waybar/macchiato.css" = {
source = pkgs.fetchFromGitHub
{
source =
pkgs.fetchFromGitHub {
owner = "catppuccin";
repo = "waybar";
rev = "f74ab1eecf2dcaf22569b396eed53b2b2fbe8aff";
sha256 = "WLJMA2X20E5PCPg0ZPtSop0bfmu+pLImP9t8A8V4QK8=";
} + "/themes/macchiato.css";
}
+ "/themes/macchiato.css";
};
programs.waybar = {
@@ -165,17 +169,16 @@ in
"position" = "top";
modules-left = [ "custom/flakestat" ];
modules-center = [ "hyprland/workspaces" ];
modules-right =
[
(lib.mkIf (withArrhist) "custom/arrhist")
"pulseaudio"
"pulseaudio#microphone"
"memory"
"cpu"
(lib.mkIf (withBattery) "battery")
"clock"
"tray"
];
modules-right = [
(lib.mkIf (withArrhist) "custom/arrhist")
"pulseaudio"
"pulseaudio#microphone"
"memory"
"cpu"
(lib.mkIf (withBattery) "battery")
"clock"
"tray"
];
"hyprland/workspaces" = {
"format" = "{name}";
"on-click" = "activate";
@@ -186,7 +189,13 @@ in
"scroll-step" = 5;
"format" = "{icon} {volume}%";
"format-muted" = "";
"format-icons" = { "default" = [ "" "" "" ]; };
"format-icons" = {
"default" = [
""
""
""
];
};
"on-scroll-up" = "pamixer -i ${volInterval}";
"on-scroll-down" = "pamixer -d ${volInterval}";
"on-click" = "pamixer -t";
@@ -209,7 +218,9 @@ in
"memory" = {
"interval" = 3;
"format" = " {percentage}%";
"states" = { "warning" = 85; };
"states" = {
"warning" = 85;
};
};
"cpu" = {
"interval" = 3;
@@ -240,7 +251,8 @@ in
"return-type" = "json";
"interval" = 600;
};
} // lib.optionalAttrs (withArrhist) {
}
// lib.optionalAttrs (withArrhist) {
"custom/arrhist" = {
"exec" = "${arrhist}/bin/arrhist";
"return-type" = "json";

3
home/hyprland/xdg.nix
View File

@@ -1,4 +1,5 @@
{ config, ... }: {
{ config, ... }:
{
xdg.configFile = {
"hypr/hyprpaper.conf" = {
source = config.lib.file.mkOutOfStoreSymlink ./. + "/hyprpaper.conf";