From 74f93cb0e3804a48f34a20737a02a86c46115c4e Mon Sep 17 00:00:00 2001 From: m3tam3re Date: Thu, 7 Nov 2024 13:35:17 +0100 Subject: [PATCH] +hyprpanel --- flake.lock | 102 ++++++++++++++++++++++++++--- flake.nix | 2 + home/features/desktop/default.nix | 1 + home/features/desktop/hyprland.nix | 2 +- home/m3tam3re/m3-kratos.nix | 24 +++++++ overlays/default.nix | 4 +- 6 files changed, 125 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 974be1d..56d4fa3 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,24 @@ { "nodes": { + "ags": { + "inputs": { + "nixpkgs": "nixpkgs", + "systems": "systems" + }, + "locked": { + "lastModified": 1728326430, + "narHash": "sha256-tV1ABHuA1HItMdCTuNdA8fMB+qw7LpjvI945VwMSABI=", + "owner": "Aylur", + "repo": "ags", + "rev": "60180a184cfb32b61a1d871c058b31a3b9b0743d", + "type": "github" + }, + "original": { + "owner": "Aylur", + "repo": "ags", + "type": "github" + } + }, "dotfiles": { "flake": false, "locked": { @@ -36,17 +55,36 @@ "type": "github" } }, - "nixpkgs": { + "hyprpanel": { + "inputs": { + "ags": "ags", + "nixpkgs": "nixpkgs_2" + }, "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "lastModified": 1730958442, + "narHash": "sha256-8vmh+ehnDnIenBNibGTPCu8p7cJiFP6bzj0E7pBxgQQ=", + "owner": "Jas-SinghFSU", + "repo": "HyprPanel", + "rev": "dbd932941b46ced4eac5da30994d5af2ca80530c", "type": "github" }, "original": { - "owner": "nixos", + "owner": "Jas-SinghFSU", + "repo": "HyprPanel", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "type": "github" + }, + "original": { + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -100,15 +138,63 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "dotfiles": "dotfiles", "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "hyprpanel": "hyprpanel", + "nixpkgs": "nixpkgs_3", "nixpkgs-a63367c": "nixpkgs-a63367c", "nixpkgs-master": "nixpkgs-master", "nixpkgs-stable": "nixpkgs-stable" } + }, + "systems": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index ed57ff0..6d7e740 100644 --- a/flake.nix +++ b/flake.nix @@ -20,6 +20,8 @@ nixpkgs-a63367c.url = "github:nixos/nixpkgs/a63367cfcdb886bee208f50db8b069f61158861d"; nixpkgs-master.url = "github:nixos/nixpkgs/master"; + hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; + dotfiles = { url = "git+https://code.m3tam3re.com/m3tam3re/dotfiles.git"; flake = false; diff --git a/home/features/desktop/default.nix b/home/features/desktop/default.nix index ffd361d..1fccfba 100644 --- a/home/features/desktop/default.nix +++ b/home/features/desktop/default.nix @@ -90,6 +90,7 @@ # eww # firefox-devedition file-roller + hyprpanel seahorse sushi # glib diff --git a/home/features/desktop/hyprland.nix b/home/features/desktop/hyprland.nix index 95c371d..5f9cb3d 100644 --- a/home/features/desktop/hyprland.nix +++ b/home/features/desktop/hyprland.nix @@ -6,7 +6,7 @@ }; exec-once = [ - "waybar" + "hyprpanel" "hyprpaper" "hypridle" "wl-paste -p -t text --watch clipman store -P --histpath=\"~/.local/share/clipman-primary.json\"" diff --git a/home/m3tam3re/m3-kratos.nix b/home/m3tam3re/m3-kratos.nix index 0f73c1f..58c8f30 100644 --- a/home/m3tam3re/m3-kratos.nix +++ b/home/m3tam3re/m3-kratos.nix @@ -22,6 +22,30 @@ in { config = mkMerge [ # Base configuration { + xdg = { + # TODO: better structure + enable = true; + configFile."mimeapps.list".force = true; + mimeApps = { + enable = true; + associations.added = { + "application/zip" = ["org.gnome.FileRoller.desktop"]; + "application/csv" = ["calc.desktop"]; + "application/pdf" = ["okularApplication_pdf.desktop"]; + "x-scheme-handler/http" = ["io.github.zen_browser.zen.desktop"]; + "x-scheme-handler/https" = ["io.github.zen_browser.zen.desktop"]; + }; + defaultApplications = { + "application/zip" = ["org.gnome.FileRoller.desktop"]; + "application/csv" = ["calc.desktop"]; + "application/pdf" = ["okularApplication_pdf.desktop"]; + "application/md" = ["nvim.desktop"]; + "application/text" = ["nvim.desktop"]; + "x-scheme-handler/http" = ["io.github.zen_browser.zen.desktop"]; + "x-scheme-handler/https" = ["io.github.zen_browser.zen.desktop"]; + }; + }; + }; features = { cli = { fish.enable = true; diff --git a/overlays/default.nix b/overlays/default.nix index d926368..d5bc29e 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,6 +1,8 @@ {inputs, ...}: { # This one brings our custom packages from the 'pkgs' directory - additions = final: _prev: import ../pkgs {pkgs = final;}; + additions = final: prev: + (import ../pkgs {pkgs = final;}) + // (inputs.hyprpanel.overlay final prev); # This one contains whatever you want to overlay # You can change versions, add patches, set compilation flags, anything really.