diff --git a/configs/hyprland/mine/hypr/monitors.conf b/configs/hyprland/mine/hypr/monitors.conf
index 76ad335..596a9c2 100644
--- a/configs/hyprland/mine/hypr/monitors.conf
+++ b/configs/hyprland/mine/hypr/monitors.conf
@@ -4,4 +4,7 @@ monitor=eDP-1,2256x1504@60.0,0x0,1.175
monitor=DP-9,1920x1080@60.0,1420x-1085,1.0
monitor=DP-10,1920x1080@60.0,-500x-1085,1.0
+monitor=DP-11,1920x1080@60.0,1420x-1085,1.0
+monitor=DP-12,1920x1080@60.0,-500x-1085,1.0
+
monitor=*,preffered,auto,1
diff --git a/flake.lock b/flake.lock
index d651a5d..f530694 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
]
},
"locked": {
- "lastModified": 1725753098,
- "narHash": "sha256-/NO/h/qD/eJXAQr/fHA4mdDgYsNT9thHQ+oT6KPi2ac=",
+ "lastModified": 1726665257,
+ "narHash": "sha256-rEzEZtd3iyVo5RJ1OGujOlnywNf3gsrOnjAn1NLciD4=",
"owner": "hyprwm",
"repo": "aquamarine",
- "rev": "e4a13203112a036fc7f437d391c7810f3dd5ab52",
+ "rev": "752d0fbd141fabb5a1e7f865199b80e6e76f8d8e",
"type": "github"
},
"original": {
@@ -137,11 +137,11 @@
"xdph": "xdph"
},
"locked": {
- "lastModified": 1726430622,
- "narHash": "sha256-50vt1snpVwS5lqvvH4p6DHiEWspJUZuJ1kYy1DKtrfM=",
+ "lastModified": 1727257173,
+ "narHash": "sha256-J4VU76LLWEILNTZ8osUaUxSny+cTUH/wCKcV+Lqr3Bw=",
"ref": "refs/heads/main",
- "rev": "9e356562446f44c471ae38a80506a9df039305d6",
- "revCount": 5224,
+ "rev": "8b86ee8bf08eaf8b57d0a7f12af876216323cc3d",
+ "revCount": 5257,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@@ -208,26 +208,6 @@
"type": "github"
}
},
- "hyprspace": {
- "inputs": {
- "hyprland": [
- "hyprland"
- ]
- },
- "locked": {
- "lastModified": 1726437584,
- "narHash": "sha256-lMIFDORuyMYHtUPrRWU5WjGcS+ZMrR4/wBSO+sgUVSY=",
- "owner": "KZDKM",
- "repo": "Hyprspace",
- "rev": "8f14fa2e10d24742d713f04c278bc7651037b74b",
- "type": "github"
- },
- "original": {
- "owner": "KZDKM",
- "repo": "Hyprspace",
- "type": "github"
- }
- },
"hyprutils": {
"inputs": {
"nixpkgs": [
@@ -240,11 +220,11 @@
]
},
"locked": {
- "lastModified": 1724966483,
- "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=",
+ "lastModified": 1727219120,
+ "narHash": "sha256-wmT+JpnDk6EjgASU2VGfS0nnu6oKA4Cw25o5fzpDD/Q=",
"owner": "hyprwm",
"repo": "hyprutils",
- "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2",
+ "rev": "db956287d3aa194dda91d05c8eb286de2a569edf",
"type": "github"
},
"original": {
@@ -265,11 +245,11 @@
]
},
"locked": {
- "lastModified": 1721324119,
- "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
+ "lastModified": 1726840673,
+ "narHash": "sha256-HIPEXyRRVZoqD6U+lFS1B0tsIU7p83FaB9m7KT/x6mQ=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
- "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
+ "rev": "b68dab23fc922eae99306988133ee80a40b39ca5",
"type": "github"
},
"original": {
@@ -397,7 +377,6 @@
"inputs": {
"home-manager": "home-manager",
"hyprland": "hyprland",
- "hyprspace": "hyprspace",
"nix-darwin": "nix-darwin",
"nixos-cosmic": "nixos-cosmic",
"nixos-hardware": "nixos-hardware",
@@ -467,11 +446,11 @@
},
"unstable": {
"locked": {
- "lastModified": 1726491728,
- "narHash": "sha256-bopKO2CikcosUq+gPKRRzeaSyj4lPvrqgyfxAMLjIbM=",
+ "lastModified": 1727275485,
+ "narHash": "sha256-uoKC6huWVsGrv8YbepyeXgj5L80TEesa7s8S9+mDT4I=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "107b787d201c792c41c2d716eecc480194b8b3fe",
+ "rev": "3510b853efd22fd14062785300e171cd0867b7c8",
"type": "github"
},
"original": {
@@ -509,6 +488,14 @@
"hyprland",
"hyprlang"
],
+ "hyprutils": [
+ "hyprland",
+ "hyprutils"
+ ],
+ "hyprwayland-scanner": [
+ "hyprland",
+ "hyprwayland-scanner"
+ ],
"nixpkgs": [
"hyprland",
"nixpkgs"
@@ -519,11 +506,11 @@
]
},
"locked": {
- "lastModified": 1726046979,
- "narHash": "sha256-6SEsjurq9cdTkITA6d49ncAJe4O/8CgRG5/F//s6Xh8=",
+ "lastModified": 1727109343,
+ "narHash": "sha256-1PFckA8Im7wMSl26okwOKqBZeCFLD3LvZZFaxswDhbY=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
- "rev": "e695669fd8e1d1be9eaae40f35e00f8bd8b64c18",
+ "rev": "4adb6c4c41ee5014bfe608123bfeddb26e5f5cea",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 8728727..f474609 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,10 +17,6 @@
inputs.nixpkgs.follows = "unstable";
inputs.systems.follows = "systems";
};
- hyprspace = {
- url = "github:KZDKM/Hyprspace";
- inputs.hyprland.follows = "hyprland";
- };
# Home manager
home-manager = {
url = "github:nix-community/home-manager/release-24.05";
@@ -47,7 +43,6 @@
, unstable-home-manager
, nix-darwin
, hyprland
- , hyprspace
, nixos-cosmic
}:
let
@@ -96,8 +91,8 @@
specialArgs = {
inputs = {
inherit
- hyprspace
- hyprland;
+ hyprland
+ unstable;
};
};
};
diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix
index 363d077..3e70d26 100644
--- a/hosts/fwbook.nix
+++ b/hosts/fwbook.nix
@@ -70,7 +70,7 @@ in
dvc-with-remotes
google-cloud-sdk
awscli
- dbeaver-bin
+ unstable.dbeaver-bin
# Photo Editing
krita
gimp-with-plugins
diff --git a/modules/home/gitconfigs/alias.conf b/modules/home/gitconfigs/alias.conf
index 65b98d3..b9825ce 100644
--- a/modules/home/gitconfigs/alias.conf
+++ b/modules/home/gitconfigs/alias.conf
@@ -30,3 +30,6 @@ sync = "!f() { \
clean-branches = "!f() { \
git for-each-ref --format '%(refname:short)' refs/heads| grep -v 'master\\|main' | xargs git branch -D ; \
}; f";
+# aliases = "!f() { \
+# git config --get-regexp alias | awk '{print $1}' | sed 's/alias\./ - /' \
+# }; f"
\ No newline at end of file
diff --git a/modules/lib.nix b/modules/lib.nix
index 50b7987..aca0433 100644
--- a/modules/lib.nix
+++ b/modules/lib.nix
@@ -28,7 +28,9 @@ let
let joinedttrs = masterAttrs // attrs;
in
nixpkgs.lib.nixosSystem {
- inherit specialArgs;
+ specialArgs = specialArgs // {
+ inherit system;
+ };
system = system;
modules = (makeImports {
attrs = joinedttrs;
diff --git a/modules/nixos/desktop/hyprland/common.nix b/modules/nixos/desktop/hyprland/common.nix
index 4fe4140..9b81efb 100644
--- a/modules/nixos/desktop/hyprland/common.nix
+++ b/modules/nixos/desktop/hyprland/common.nix
@@ -1,43 +1,49 @@
{ config, lib, pkgs, inputs, ... }:
let
cfg = config.skyg.nixos.desktop.hyprland;
- hyprpkgs = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system};
in
{
- config = lib.mkIf cfg.enabled {
- programs.hyprland = {
- enable = true;
- # package = hyprpkgs.hyprland;
- portalPackage = pkgs.xdg-desktop-portal-hyprland;
- xwayland.enable = true;
- systemd.setPath.enable = true;
+ config =
+ let
+ hyprpkgs =
+ if cfg.useDevelopmentMode then inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}
+ else pkgs
+ ;
+ in
+ lib.mkIf cfg.enabled {
+ programs.hyprland = {
+ enable = true;
+ package = hyprpkgs.hyprland;
+ portalPackage = hyprpkgs.xdg-desktop-portal-hyprland;
+ xwayland.enable = true;
+ systemd.setPath.enable = true;
+ };
+
+ xdg.portal.extraPortals = [ hyprpkgs.xdg-desktop-portal-hyprland ];
+ services.hypridle.enable = true;
+ environment.sessionVariables = { NIXOS_OZONE_WL = "1"; };
+ environment.systemPackages = with pkgs; [
+ # sound
+ pavucontrol
+
+ # notification daemon
+ dunst
+ libnotify
+
+ # App Support
+ xwaylandvideobridge
+ lxqt.lxqt-policykit
+ xdg-desktop-portal
+ auto-cpufreq
+
+ # general utilities
+ brightnessctl # brightness ctl
+ networkmanagerapplet # networking
+ ];
+ #
};
- xdg.portal.enable = true;
- xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
- services.hypridle.enable = true;
- environment.sessionVariables = { NIXOS_OZONE_WL = "1"; };
- environment.systemPackages = with pkgs; [
- # sound
- pavucontrol
-
- # notification daemon
- dunst
- libnotify
-
- # App Support
- xwaylandvideobridge
- lxqt.lxqt-policykit
- xdg-desktop-portal
- auto-cpufreq
-
- # general utilities
- brightnessctl # brightness ctl
- networkmanagerapplet # networking
- ];
- #
- };
}
diff --git a/modules/nixos/desktop/hyprland/default.nix b/modules/nixos/desktop/hyprland/default.nix
index 07e67ac..9681e8b 100644
--- a/modules/nixos/desktop/hyprland/default.nix
+++ b/modules/nixos/desktop/hyprland/default.nix
@@ -11,6 +11,8 @@
"Hyprland";
useNWG = mkEnableOption
"nwg-shell experience";
+ useDevelopmentMode = mkEnableOption
+ "use the dev mode of hyprland";
};
};
}
diff --git a/modules/nixos/desktop/hyprland/mine.nix b/modules/nixos/desktop/hyprland/mine.nix
index 20c15b7..11d54a9 100644
--- a/modules/nixos/desktop/hyprland/mine.nix
+++ b/modules/nixos/desktop/hyprland/mine.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, inputs, system, ... }:
let
cfg = config.skyg.nixos.desktop.hyprland;
in
@@ -7,33 +7,30 @@ in
home-manager.users.${config.skyg.user.name}.wayland.windowManager.hyprland = {
enable = true;
xwayland.enable = true;
- # package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
- # plugins = [
- # inputs.hyprspace.packages.${pkgs.system}.Hyprspace
- # ];
extraConfig = ''
source = ~/.config/hypr/hyprland.d/*.conf
debug:enable_stdout_logs = true
'';
};
programs.hyprlock.enable = true;
- environment.systemPackages = with pkgs; [
- # general utilities
- swappy # screenshot editor
- hyprshot # screenshots
- cliphist # clipboard manager
- gnome.nautilus # file manager
- wofi # app launcher
- wl-screenrec # screen recorder
- slurp # helper selection tools
- waypaper # wallpaper manager
- swww # wallpaper service
- waybar # top bar
- nwg-panel # top bar
- nwg-dock-hyprland # bottom bar
- nwg-displays # display management
- nwg-bar # logout window
- ];
+ environment.systemPackages =
+ (with pkgs; [
+ # general utilities
+ swappy # screenshot editor
+ hyprshot # screenshots
+ cliphist # clipboard manager
+ gnome.nautilus # file manager
+ wofi # app launcher
+ wl-screenrec # screen recorder
+ slurp # helper selection tools
+ waypaper # wallpaper manager
+ swww # wallpaper service
+ waybar # top bar
+ nwg-panel # top bar
+ nwg-dock-hyprland # bottom bar
+ nwg-displays # display management
+ nwg-bar # logout window
+ ]);
system.userActivationScripts.hyprlandMineConfig.text = ''
rm -f "$HOME/.config/hypr"
if [[ ! -h "$HOME/.config/hypr" ]]; then
diff --git a/modules/nixos/desktop/kde.nix b/modules/nixos/desktop/kde.nix
index 2ac991e..ec35184 100644
--- a/modules/nixos/desktop/kde.nix
+++ b/modules/nixos/desktop/kde.nix
@@ -1,17 +1,15 @@
{ config, lib, pkgs, ... }:
-with lib;
-
let
cfg = config.skyg.nixos.desktop.kde;
in
{
options = {
skyg.nixos.desktop.kde = {
- enabled = mkEnableOption
+ enabled = lib.mkEnableOption
"KDE";
};
};
- config = mkIf cfg.enabled {
+ config = lib.mkIf cfg.enabled {
services.desktopManager.plasma6.enable = true;
services.desktopManager.plasma6.enableQt5Integration = true;
environment.plasma6.excludePackages = with pkgs.kdePackages; [
@@ -20,12 +18,12 @@ in
kate # text editor
gwenview # image viewer
];
+ xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
environment.systemPackages = with pkgs; [
kdePackages.plasma-browser-integration
kdePackages.xdg-desktop-portal-kde
konsave # save configs
];
services.desktopManager.plasma6.notoPackage = pkgs.fira-code;
- xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
};
}
diff --git a/modules/nixos/desktop/wayland.nix b/modules/nixos/desktop/wayland.nix
index ea32e2d..4447192 100644
--- a/modules/nixos/desktop/wayland.nix
+++ b/modules/nixos/desktop/wayland.nix
@@ -13,5 +13,6 @@ in
xdg-desktop-portal-gtk
];
programs.xwayland.enable = true;
+ xdg.portal.enable = true;
};
}