Compare commits

...

5 commits

Author SHA1 Message Date
Emmet de4875268a Updated system 2024-09-07 14:02:36 -05:00
Emmet 03844a1d63 Qutebrowser passthrough bindings for normal browser operation 2024-09-07 11:15:21 -05:00
Emmet 8a8531746b Added binding to pin window 2024-09-07 11:15:10 -05:00
Emmet 2c04bfca65 Maybe fixes some blender rendering? 2024-09-07 11:14:54 -05:00
Emmet bd23b3785b Improved media editing on hyprland 2024-09-07 11:14:29 -05:00
9 changed files with 111 additions and 97 deletions

View file

@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723405438, "lastModified": 1725199881,
"narHash": "sha256-bpmC2m7OhlDvqgQZdZ2jBLyeIkq/Jld3X4bqRAxBSp8=", "narHash": "sha256-jsmipf/u1GFZE5tBUkr56CHMN6VpUWCAjfLIhvQijU0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "9312aa28271c91e5d67ecb9def527b2bbcff0e66", "rev": "f8a687dd29ff019657498f1bd14da2fbbf0e604b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -150,11 +150,11 @@
"blocklist-hosts": { "blocklist-hosts": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725060487, "lastModified": 1725674607,
"narHash": "sha256-rzE0YCORL0Vh4FwL4BK18iiG44T7NdaF1CS6Nollgjc=", "narHash": "sha256-vTaoz2yRd9g3NZNKYufZeB8UJ381aBPmRV91lEmV37o=",
"owner": "StevenBlack", "owner": "StevenBlack",
"repo": "hosts", "repo": "hosts",
"rev": "1295ae360bb5e60c8fce2b10eedaa4d8c7b0802d", "rev": "10b187280ec15374e4d2b28e7705046e7d535d91",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -538,11 +538,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720042825, "lastModified": 1725703823,
"narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", "rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -559,11 +559,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724435763, "lastModified": 1725694918,
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "narHash": "sha256-+HsjshXpqNiJHLaJaK0JnIicJ/a1NquKcfn4YZ3ILgg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "rev": "aaebdea769a5c10f1c6e50ebdf5924c1a13f0cda",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -637,16 +637,16 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1723738134, "lastModified": 1725208645,
"narHash": "sha256-fKZY7oieA3mgwPD6b1gQqpp9nVgRhv8xlRh6T+Drylc=", "narHash": "sha256-Rv6Uskm5ToMzHX/+194pYYVexfEvz8WiIjfjGoPySu8=",
"rev": "520e91238f0e6e6990e6a0845d73d85012485525", "rev": "7a24e564f43d4c24abf2ec4e5351007df2f8926c",
"revCount": 5093, "revCount": 5176,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://code.hyprland.org/hyprwm/Hyprland.git" "url": "https://code.hyprland.org/hyprwm/Hyprland.git"
}, },
"original": { "original": {
"rev": "520e91238f0e6e6990e6a0845d73d85012485525", "rev": "7a24e564f43d4c24abf2ec4e5351007df2f8926c",
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://code.hyprland.org/hyprwm/Hyprland.git" "url": "https://code.hyprland.org/hyprwm/Hyprland.git"
@ -725,11 +725,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721324361, "lastModified": 1725188252,
"narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", "narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", "rev": "c12ab785ce1982f82594aff03b3104c598186ddd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -777,15 +777,16 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1721822339, "lastModified": 1725203994,
"narHash": "sha256-dkhgyxPxmOI/ZHk/LZRQZAVjtk9kPx2RFQRnuEoXQ4s=", "narHash": "sha256-N7Kfq8tpOWjtRKBnH5RqcDtQFGZPZ5vXgmxbnZVPCuU=",
"rev": "58e1a4a4997728be886a46d031514b3f09763c5d", "ref": "refs/heads/main",
"revCount": 234, "rev": "73b0fc26c0e2f6f82f9d9f5b02e660a958902763",
"revCount": 248,
"type": "git", "type": "git",
"url": "https://code.hyprland.org/hyprwm/hyprlock.git" "url": "https://code.hyprland.org/hyprwm/hyprlock.git"
}, },
"original": { "original": {
"rev": "58e1a4a4997728be886a46d031514b3f09763c5d", "rev": "73b0fc26c0e2f6f82f9d9f5b02e660a958902763",
"type": "git", "type": "git",
"url": "https://code.hyprland.org/hyprwm/hyprlock.git" "url": "https://code.hyprland.org/hyprwm/hyprlock.git"
} }
@ -802,11 +803,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722869141, "lastModified": 1724966483,
"narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=", "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "0252fd13e78e60fb0da512a212e56007515a49f7", "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1055,11 +1056,11 @@
"nmd": "nmd" "nmd": "nmd"
}, },
"locked": { "locked": {
"lastModified": 1721670745, "lastModified": 1725658585,
"narHash": "sha256-rjTQ14dqQ90EaHQy4g/mGylrJ1aZJYc3wCXc4A3GHJg=", "narHash": "sha256-P29z4Gt89n5ps1U7+qmIrj0BuRXGZQSIaOe2+tsPgfw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-on-droid", "repo": "nix-on-droid",
"rev": "248cc0806120fac9214f503dee0eaf0f47740dd0", "rev": "5d88ff2519e4952f8d22472b52c531bb5f1635fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1088,11 +1089,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1724819573, "lastModified": 1725634671,
"narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1135,11 +1136,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1725001927, "lastModified": 1725407940,
"narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", "narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", "rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1166,11 +1167,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1723415338, "lastModified": 1725194671,
"narHash": "sha256-K/BVeDLkpswRSBh3APxc2gBNVFEMXGpnkuQz666FiTM=", "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6e8760f7f7121128e2037db44915a4a5450b6e67", "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1467,11 +1468,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724556439, "lastModified": 1725727445,
"narHash": "sha256-gPR3sxkKxISUvydnqoj54znpUkK8av/HVFuFJuYUw3w=", "narHash": "sha256-f5TrY73wfL4kvRmEtZXpzgCuxVFlNqMUNY6QSX16IPA=",
"owner": "pjones", "owner": "pjones",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "5c97fe8af2a2e561f14195ed357d8c451fdbff4c", "rev": "1b9c8200d6438c98c427536abbc5b6fd6a5250c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1553,11 +1554,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1724984647, "lastModified": 1725675754,
"narHash": "sha256-BC6MUq0CTdmAu/cueVcdWTI+S95s0mJcn19SoEgd7gU=", "narHash": "sha256-hXW3csqePOcF2e/PYnpXj72KEYyNj2HzTrVNmS/F7Ug=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "87b6cffc276795b46ef544d7ed8d7fed6ad9c8e4", "rev": "8cc45e678e914a16c8e224c3237fb07cf21e5e54",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1615,11 +1616,11 @@
"systems": "systems_6" "systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1724702977, "lastModified": 1725290973,
"narHash": "sha256-bP1/BHbEigLjTTmqyy1t8w5EVWHuLuABtOd/BBXVLtA=", "narHash": "sha256-+jwXF9KI0HfvDgpsoJGvOdfOGGSKOrID1wQB79zjUbo=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "6c895c6b42ca205017abe72a7263baf36a197972", "rev": "ef81ad9e85e60420cc83d4642619c14b57139d33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1785,11 +1786,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722365976, "lastModified": 1725203932,
"narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=", "narHash": "sha256-VLULC/OnI+6R9KEP2OIGk+uLJJsfRlaLouZ5gyFd2+Y=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341", "rev": "2425e8f541525fa7409d9f26a8ffaf92a3767251",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -228,7 +228,7 @@
type = "git"; type = "git";
url = "https://code.hyprland.org/hyprwm/Hyprland.git"; url = "https://code.hyprland.org/hyprwm/Hyprland.git";
submodules = true; submodules = true;
rev = "520e91238f0e6e6990e6a0845d73d85012485525"; #v0.42.0+ rev = "7a24e564f43d4c24abf2ec4e5351007df2f8926c"; #v0.42.0+
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hyprland-plugins = { hyprland-plugins = {
@ -240,7 +240,7 @@
hyprlock = { hyprlock = {
type = "git"; type = "git";
url = "https://code.hyprland.org/hyprwm/hyprlock.git"; url = "https://code.hyprland.org/hyprwm/hyprlock.git";
rev = "58e1a4a4997728be886a46d031514b3f09763c5d"; rev = "73b0fc26c0e2f6f82f9d9f5b02e660a958902763";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hyprgrass.url = "github:horriblename/hyprgrass/0bb3b822053c813ab6f695c9194089ccb5186cc3"; hyprgrass.url = "github:horriblename/hyprgrass/0bb3b822053c813ab6f695c9194089ccb5186cc3";

View file

@ -1,37 +1,23 @@
diff -crB nixpkgs/pkgs/applications/editors/emacs/build-support/generic.nix nixpkgs-patched/pkgs/applications/editors/emacs/build-support/generic.nix diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix
*** nixpkgs/pkgs/applications/editors/emacs/build-support/generic.nix 2023-09-08 20:42:24.476059868 -0500 index 3ff10ee86..56d03b6e6 100644
--- nixpkgs-patched/pkgs/applications/editors/emacs/build-support/generic.nix 2023-09-08 21:12:46.637645595 -0500 --- a/pkgs/applications/editors/emacs/build-support/generic.nix
*************** +++ b/pkgs/applications/editors/emacs/build-support/generic.nix
*** 3,9 **** @@ -25,7 +25,8 @@ in
{ lib, stdenv, emacs, texinfo, writeText, gcc, ... }:
libBuildHelper.extendMkDerivation' stdenv.mkDerivation (finalAttrs:
{ pname
! , version -{ buildInputs ? []
, buildInputs ? [] +{ version ? null
, packageRequires ? [] +, buildInputs ? []
, meta ? {} , nativeBuildInputs ? []
--- 3,9 ---- , packageRequires ? []
{ lib, stdenv, emacs, texinfo, writeText, gcc, ... }: , propagatedBuildInputs ? []
@@ -38,7 +39,7 @@ libBuildHelper.extendMkDerivation' stdenv.mkDerivation (finalAttrs:
{ pname }@args:
! , version ? null
, buildInputs ? [] {
, packageRequires ? [] - name = args.name or "emacs-${finalAttrs.pname}-${finalAttrs.version}";
, meta ? {} + name = args.name or "emacs-${finalAttrs.pname}${lib.optionalString (version != null) "-${version}"}";
***************
*** 20,26 **** unpackCmd = args.unpackCmd or ''
in case "$curSrc" in
stdenv.mkDerivation (finalAttrs: ({
! name = "emacs-${pname}-${finalAttrs.version}";
unpackCmd = ''
case "$curSrc" in
--- 20,26 ----
in
stdenv.mkDerivation (finalAttrs: ({
! name = "emacs-${pname}${lib.optionalString (version != null) "-${version}"}";
unpackCmd = ''
case "$curSrc" in

View file

@ -79,7 +79,7 @@
users.users.${userSettings.username} = { users.users.${userSettings.username} = {
isNormalUser = true; isNormalUser = true;
description = userSettings.name; description = userSettings.name;
extraGroups = [ "networkmanager" "wheel" "input" "dialout" ]; extraGroups = [ "networkmanager" "wheel" "input" "dialout" "video" "render" ];
packages = []; packages = [];
uid = 1000; uid = 1000;
}; };

View file

@ -110,12 +110,16 @@
# Media # Media
gimp gimp
krita krita
pinta
inkscape inkscape
(pkgs-stable.lollypop.override { youtubeSupport = false; }) (pkgs-stable.lollypop.override { youtubeSupport = false; })
vlc vlc
mpv mpv
yt-dlp yt-dlp
blender-hip (blender-hip.override {
cudaSupport = true;
})
libresprite
# cura is moderately broken on wayland, so use xwayland # cura is moderately broken on wayland, so use xwayland
(pkgs-stable.cura.overrideAttrs (oldAttrs: { (pkgs-stable.cura.overrideAttrs (oldAttrs: {
postInstall = oldAttrs.postInstall + ''cp -rf ${(pkgs.makeDesktopItem { postInstall = oldAttrs.postInstall + ''cp -rf ${(pkgs.makeDesktopItem {
@ -179,7 +183,8 @@
libffi zlib libffi zlib
nodePackages.ungit nodePackages.ungit
ventoy ventoy
]) ++ ([ pkgs-kdenlive.kdenlive ]); kdePackages.kdenlive
]);
home.file.".local/share/pixmaps/nixos-snowflake-stylix.svg".source = home.file.".local/share/pixmaps/nixos-snowflake-stylix.svg".source =
config.lib.stylix.colors { config.lib.stylix.colors {

View file

@ -4,7 +4,7 @@
# Fonts are nice to have # Fonts are nice to have
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
# Fonts # Fonts
nerdfonts # nerdfonts # FIXME broken
# powerline # FIXME broken by python 311 -> 312 nixpkgs update # powerline # FIXME broken by python 311 -> 312 nixpkgs update
]; ];

View file

@ -208,11 +208,23 @@ config.bind('<Ctrl-p>', 'fake-key <Up>', mode='normal')
config.bind('<Ctrl-n>', 'fake-key <Down>', mode='normal') config.bind('<Ctrl-n>', 'fake-key <Down>', mode='normal')
config.bind('<Ctrl-p>', 'fake-key <Up>', mode='insert') config.bind('<Ctrl-p>', 'fake-key <Up>', mode='insert')
config.bind('<Ctrl-n>', 'fake-key <Down>', mode='insert') config.bind('<Ctrl-n>', 'fake-key <Down>', mode='insert')
config.bind('<Ctrl-p>', 'fake-key <Up>', mode='passthrough')
config.bind('<Ctrl-n>', 'fake-key <Down>', mode='passthrough')
# bindings from vimium # bindings from vimium
config.bind('t', 'open -t') config.bind('t', 'open -t')
config.bind('x', 'tab-close') config.bind('x', 'tab-close')
config.bind('yf', 'hint links yank') config.bind('yf', 'hint links yank')
config.bind('<Ctrl-Tab>', 'tab-next')
config.bind('<Ctrl-Shift-Tab>', 'tab-prev')
# passthrough bindings
config.bind('<Shift-Escape>', 'mode-leave', mode='passthrough')
config.bind('<Ctrl-T>', 'open -t', mode='passthrough')
config.bind('<Ctrl-W>', 'tab-close', mode='passthrough')
config.bind('<Ctrl-Tab>', 'tab-next', mode='passthrough')
config.bind('<Ctrl-Shift-Tab>', 'tab-prev', mode='passthrough')
config.bind('<Ctrl-B>', 'cmd-set-text -s :quickmark-load -t', mode='passthrough')
# spawn external programs # spawn external programs
config.bind(',m', 'hint links spawn mpv {hint-url}') config.bind(',m', 'hint links spawn mpv {hint-url}')

View file

@ -142,8 +142,9 @@ ext cbz, has zathura, X, flag f = zathura -- "$@"
#------------------------------------------- #-------------------------------------------
# Images # Images
#------------------------------------------- #-------------------------------------------
mime ^image, has krita, X, flag f = krita "$@"
mime ^image/svg, has inkscape, X, flag f = inkscape "$@" mime ^image/svg, has inkscape, X, flag f = inkscape "$@"
mime ^image, has pinta, X, flag f = pinta "$@"
mime ^image, has krita, X, flag f = krita "$@"
#------------------------------------------- #-------------------------------------------
# Archives # Archives

View file

@ -171,7 +171,7 @@ in
bind=SUPERCTRL,S,exec,container-open # qutebrowser only bind=SUPERCTRL,S,exec,container-open # qutebrowser only
bind=SUPERCTRL,R,exec,phoenix refresh bind=SUPERCTRL,P,pin
bind=SUPER,code:47,exec,fuzzel bind=SUPER,code:47,exec,fuzzel
bind=SUPER,X,exec,fnottctl dismiss bind=SUPER,X,exec,fnottctl dismiss
@ -315,6 +315,14 @@ in
windowrulev2 = float,class:^(pokefinder)$ windowrulev2 = float,class:^(pokefinder)$
windowrulev2 = float,class:^(Waydroid)$ windowrulev2 = float,class:^(Waydroid)$
windowrulev2 = float,class:^(blender)$
windowrulev2 = float,class:^(org.inkscape.Inkscape)$
windowrulev2 = float,class:^(pinta)$
windowrulev2 = float,class:^(krita)$
windowrulev2 = float,class:^(Gimp)
windowrulev2 = float,class:^(Gimp)
windowrulev2 = float,class:^(libresprite)$
windowrulev2 = opacity 0.80,title:ORUI windowrulev2 = opacity 0.80,title:ORUI
windowrulev2 = opacity 1.0,class:^(org.qutebrowser.qutebrowser),fullscreen:1 windowrulev2 = opacity 1.0,class:^(org.qutebrowser.qutebrowser),fullscreen:1
@ -349,6 +357,7 @@ in
bind=SUPER,I,exec,networkmanager_dmenu bind=SUPER,I,exec,networkmanager_dmenu
bind=SUPER,P,exec,keepmenu bind=SUPER,P,exec,keepmenu
bind=SUPERSHIFT,P,exec,hyprprofile-dmenu bind=SUPERSHIFT,P,exec,hyprprofile-dmenu
bind=SUPERCTRL,R,exec,phoenix refresh
# 3 monitor setup # 3 monitor setup
monitor=eDP-1,1920x1080@300,900x1080,1 monitor=eDP-1,1920x1080@300,900x1080,1