Compare commits

..

No commits in common. "2b6fc478ff56ebf4b88cbb5b5931a0191a2a1a54" and "12a3620712d787b6cb99838daeab1ec359013b36" have entirely different histories.

8 changed files with 34 additions and 149 deletions

151
flake.lock generated
View File

@ -69,11 +69,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733168902, "lastModified": 1731746438,
"narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", "narHash": "sha256-f3SSp1axoOk0NAI7oFdRzbxG2XPBSIXC+/DaAXnvS1A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", "rev": "cb64993826fa7a477490be6ccb38ba1fa1e18fa8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -126,11 +126,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733389730, "lastModified": 1731235328,
"narHash": "sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag=", "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "65912bc6841cf420eb8c0a20e03df7cbbff5963f", "rev": "60bb110917844d354f3c18e05450606a435d2d10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -139,39 +139,17 @@
"type": "github" "type": "github"
} }
}, },
"hyprlang": {
"inputs": {
"nixpkgs": [
"rose-pine-hyprcursor",
"nixpkgs"
],
"systems": "systems_3"
},
"locked": {
"lastModified": 1709914708,
"narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprpanel": { "hyprpanel": {
"inputs": { "inputs": {
"ags": "ags", "ags": "ags",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1733062031, "lastModified": 1730958442,
"narHash": "sha256-cPm3IukRcKZqTgmjL9kh3ZYGoXBD8elaTQ3TFo+W67Q=", "narHash": "sha256-8vmh+ehnDnIenBNibGTPCu8p7cJiFP6bzj0E7pBxgQQ=",
"owner": "Jas-SinghFSU", "owner": "Jas-SinghFSU",
"repo": "HyprPanel", "repo": "HyprPanel",
"rev": "955eed6c60a3ea5d6b0b1b8b7086cffbae984277", "rev": "dbd932941b46ced4eac5da30994d5af2ca80530c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -214,11 +192,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1733475586, "lastModified": 1731503721,
"narHash": "sha256-aGnfZmx5nByXIhTgrOUqARSSG1zuaD+rWPKW0gOczp0=", "narHash": "sha256-sEDguy1Fy9oGwdJTD27axz7yjUmFUe9SREkaWEybsRU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d8dfbe84b904687ca920644fd959d06cd738e31a", "rev": "83cabf210fb7b5f0adc67142ceb4dab95519ccdd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -230,11 +208,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1733220138, "lastModified": 1731239293,
"narHash": "sha256-Yh5XZ9yVurrcYdNTSWxYgW4+EJ0pcOqgM1043z9JaRc=", "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bcb68885668cccec12276bbb379f8f2557aa06ce", "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -262,11 +240,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1732758367, "lastModified": 1729880355,
"narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -278,11 +256,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1733392399, "lastModified": 1731139594,
"narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -292,22 +270,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": {
"locked": {
"lastModified": 1710272261,
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
@ -318,28 +280,7 @@
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"nixpkgs-b69de56": "nixpkgs-b69de56", "nixpkgs-b69de56": "nixpkgs-b69de56",
"nixpkgs-master": "nixpkgs-master", "nixpkgs-master": "nixpkgs-master",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable"
"rose-pine-hyprcursor": "rose-pine-hyprcursor"
}
},
"rose-pine-hyprcursor": {
"inputs": {
"hyprlang": "hyprlang",
"nixpkgs": "nixpkgs_5",
"utils": "utils"
},
"locked": {
"lastModified": 1733265112,
"narHash": "sha256-FdO+2X7TeIAW73hiyFKZbCjlAskb4xMmYYPX97mo9RE=",
"owner": "ndom91",
"repo": "rose-pine-hyprcursor",
"rev": "89dc9e347ce8da26766ad421b0899536f9f87639",
"type": "github"
},
"original": {
"owner": "ndom91",
"repo": "rose-pine-hyprcursor",
"type": "github"
} }
}, },
"systems": { "systems": {
@ -371,54 +312,6 @@
"repo": "default-linux", "repo": "default-linux",
"type": "github" "type": "github"
} }
},
"systems_3": {
"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"
}
},
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View File

@ -28,7 +28,6 @@
}; };
hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor";
dotfiles = { dotfiles = {
url = "git+https://code.m3tam3re.com/m3tam3re/dotfiles.git"; url = "git+https://code.m3tam3re.com/m3tam3re/dotfiles.git";

View File

@ -63,9 +63,8 @@
httpie httpie
jq jq
just just
lazygit
llm
lf lf
lazygit
nix-index nix-index
procs procs
progress progress

View File

@ -105,7 +105,6 @@
# stable.nyxt # stable.nyxt
# pcmanfm # pcmanfm
protonmail-desktop protonmail-desktop
rose-pine-hyprcursor
# qt5ct # qt5ct
# qt6.qtwayland # qt6.qtwayland
#rustdesk #rustdesk

View File

@ -14,7 +14,6 @@
env = [ env = [
"XCURSOR_SIZE,32" "XCURSOR_SIZE,32"
"HYPRCURSOR_THEME,rose-pine-hyprcursor"
"WLR_NO_HARDWARE_CURSORS,1" "WLR_NO_HARDWARE_CURSORS,1"
"GTK_THEME,Dracula" "GTK_THEME,Dracula"
]; ];
@ -38,14 +37,12 @@
}; };
decoration = { decoration = {
shadow = { "col.shadow" = "rgba(1E202966)";
enabled = true; drop_shadow = true;
range = 60; shadow_range = 60;
render_power = 3; shadow_offset = "1 2";
color = "rgba(1E202966)"; shadow_render_power = 3;
offset = "1 2"; shadow_scale = 0.97;
scale = 0.97;
};
rounding = 8; rounding = 8;
blur = { blur = {
enabled = true; enabled = true;

View File

@ -22,9 +22,7 @@ in {
gst_all_1.gstreamer gst_all_1.gstreamer
gst_all_1.gst-vaapi gst_all_1.gst-vaapi
handbrake handbrake
inkscape
kdePackages.kdenlive kdePackages.kdenlive
krita
makemkv makemkv
mpv mpv
pamixer pamixer
@ -37,7 +35,7 @@ in {
# vlc # vlc
# webcord # webcord
# yt-dlp # yt-dlp
unimatrix # unimatrix
]; ];
programs.obs-studio = { programs.obs-studio = {

View File

@ -71,8 +71,8 @@ in {
enable = true; enable = true;
settings = { settings = {
monitor = [ monitor = [
"eDP-1,preferred,0x0,1.25" "DP-1,2560x1440@144,0x0,1"
"HDMI-A-1,2560x1440@144,2560x0,1" "DP-2,2560x1440@144,2560x0,1"
]; ];
workspace = [ workspace = [
"1, monitor:DP-1, default:true" "1, monitor:DP-1, default:true"

View File

@ -2,8 +2,8 @@
# This one brings our custom packages from the 'pkgs' directory # This one brings our custom packages from the 'pkgs' directory
additions = final: prev: additions = final: prev:
(import ../pkgs {pkgs = final;}) (import ../pkgs {pkgs = final;})
// (inputs.hyprpanel.overlay final prev) // (inputs.hyprpanel.overlay final prev);
// {rose-pine-hyprcursor = inputs.rose-pine-hyprcursor.packages.${prev.system}.default;};
# This one contains whatever you want to overlay # This one contains whatever you want to overlay
# You can change versions, add patches, set compilation flags, anything really. # You can change versions, add patches, set compilation flags, anything really.
# https://nixos.wiki/wiki/Overlays # https://nixos.wiki/wiki/Overlays