updating and removing latte-dock

This commit is contained in:
Chris Cochrun 2022-12-15 09:37:20 -06:00
parent 1bece25e37
commit f03a86e909
4 changed files with 221 additions and 136 deletions

View file

@ -168,10 +168,6 @@ nix = {
package = pkgs.nixVersions.unstable; package = pkgs.nixVersions.unstable;
}; };
nixpkgs.config.permittedInsecurePackages = [
"qtwebkit-5.212.0-alpha4"
];
#+end_src #+end_src
I use plasma and awesome mostly as my desktop. Also all desktops will likely need ntfs support in order to work with windows devices. I use plasma and awesome mostly as my desktop. Also all desktops will likely need ntfs support in order to work with windows devices.
@ -188,7 +184,7 @@ services.xserver = {
displayManager = { displayManager = {
startx.enable = true; startx.enable = true;
sddm = { sddm = {
enable = true; enable = false;
}; };
session = [ session = [
{ {
@ -209,15 +205,15 @@ services.xserver = {
}; };
services.greetd = { services.greetd = {
enable = false; enable = true;
settings = rec { settings = rec {
initial_session = { initial_session = {
command = "dbus-launch systemctl --user restart plasma-run-with-systemd.service"; command = "/home/chris/bin/hyprland";
user = "chris"; user = "chris";
}; };
default_session = initial_session; default_session = initial_session;
hyprland_session = { hyprland_session = {
command = "/home/chris/bin/hyprland"; command = "dbus-launch systemctl --user restart plasma-run-with-systemd.service";
user = "chris"; user = "chris";
}; };
}; };
@ -418,7 +414,7 @@ python310Packages.mutagen
python310Packages.audiotools python310Packages.audiotools
mpv mpv
nerdfonts nerdfonts
latte-dock # latte-dock
plasma-browser-integration plasma-browser-integration
alacritty alacritty
libsForQt5.bismuth libsForQt5.bismuth
@ -503,28 +499,28 @@ Here are some dev tools that I often have on a few devices.
#+begin_src nix #+begin_src nix
# android-tools # android-tools
nix-index nix-index
meson # meson
ninja # ninja
gnumake # gnumake
gcc # gcc
gdb # gdb
clang # clang
clang-tools # clang-tools
cmake # cmake
qtcreator # qtcreator
extra-cmake-modules # extra-cmake-modules
pkg-config # pkg-config
libsForQt5.wrapQtAppsHook # libsForQt5.wrapQtAppsHook
python310Packages.pyqt5 # python310Packages.pyqt5
# LIBRARIES FOR DEV # LIBRARIES FOR DEV
qt5.qtbase # qt5.qtbase
qt5.qtquickcontrols2 # qt5.qtquickcontrols2
qt5.qtx11extras # qt5.qtx11extras
libsForQt5.appstream-qt # libsForQt5.appstream-qt
libsForQt5.kdelibs4support # libsForQt5.kdelibs4support
libsForQt5.kirigami2 # libsForQt5.kirigami2
libsForQt5.ki18n # libsForQt5.ki18n
libsForQt5.kcoreaddons # libsForQt5.kcoreaddons
# plasma5Packages.kirigami2 # plasma5Packages.kirigami2
sqlite sqlite
fennel fennel
@ -533,7 +529,7 @@ fennel
Let's create our own custom LightlyShaders package. This is in it's own file for now. Let's create our own custom LightlyShaders package. This is in it's own file for now.
#+NAME: lightlyshaders #+NAME: lightlyshaders
#+begin_src nix #+begin_src nix
(libsForQt5.callPackage /home/chris/dev/LightlyShaders {}) # (libsForQt5.callPackage /home/chris/dev/LightlyShaders {})
#+end_src #+end_src
Let's also add our own package from my WIP presenter Let's also add our own package from my WIP presenter

View file

@ -1,5 +1,27 @@
{ {
"nodes": { "nodes": {
"cargo2nix": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1655189312,
"narHash": "sha256-gpJ57OgIebUpO+7F00VltxSEy6dz2x6HeJ5BcRM8rDA=",
"owner": "cargo2nix",
"repo": "cargo2nix",
"rev": "c149357cc3d17f2849c73eb7a09d07a307cdcfe8",
"type": "github"
},
"original": {
"owner": "cargo2nix",
"ref": "release-0.11.0",
"repo": "cargo2nix",
"type": "github"
}
},
"emacs": { "emacs": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
@ -8,11 +30,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1670235510, "lastModified": 1671099536,
"narHash": "sha256-f+gUkF9duBRYbQdCMsaVHNFgsxN6R32ZXXOJU3cND3Y=", "narHash": "sha256-e0VCSDEg1NCfqf17A36pccksqYF+m1NCcc0p+cOP89M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "dd60ef06981fec354663054e608bbfcd7f8f1cff", "rev": "0e1a47eadd23dc5669f056f28de606c9d00a1c29",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -30,11 +52,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1669643151, "lastModified": 1670426053,
"narHash": "sha256-39/l57QusriyNr426kXNqtub0ciZna+t20VKPYUAgsM=", "narHash": "sha256-OrFeZuwiiw+pIwhB+VaYzgUJu3CDaXkv0eYIXVDUnPs=",
"owner": "elkowar", "owner": "elkowar",
"repo": "eww", "repo": "eww",
"rev": "ec4c2d1a4f12e9c3664e9f53ad99007b4a10a16a", "rev": "678e4dbc6b6439bf50898ae2b13fcc65900c439c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -84,6 +106,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1650374568,
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
@ -116,11 +154,11 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1653893745,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -144,6 +182,21 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_5": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -152,11 +205,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1670245450, "lastModified": 1670970889,
"narHash": "sha256-SSHD2iuPw7dKpAHX7DMTBKCm+/drigwC5//xkf+v/AM=", "narHash": "sha256-TWJo3/X3Q3r+HeX16QN4FE6ddBpGtAboymSEF+4Nnc0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "747e36476f341720404bd0d14d687a135a4ce5bf", "rev": "e412025fffdcd6219ddd21c65d9a1b90005ce508",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -176,11 +229,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1670267535, "lastModified": 1671043368,
"narHash": "sha256-The+YCkkQ0dYXJWECktItiki7l8ImTsP2u1DKXkTzk0=", "narHash": "sha256-mV63L9g/qQ37eMftY05tTCk2OWcXrkmt7ep9uDClhqI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "da76a1ed9eab3d1b5cf5fae4d040f8efe08b586c", "rev": "b89a07596e9f1caa353caec13cb328a98b39944c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -192,11 +245,11 @@
"hyprland-protocols": { "hyprland-protocols": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1670258048, "lastModified": 1670703428,
"narHash": "sha256-Lm2sXnDVZNE+taHqsqVibvPmSdu65VHvXI507KVX4lg=", "narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "0dcff94fc10df2bbb66d3e1b5a1d6cfd3ada5515", "rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -208,11 +261,11 @@
"hyprland-protocols_2": { "hyprland-protocols_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1670185345, "lastModified": 1670703428,
"narHash": "sha256-hxWGqlPecqEsE6nOHDV29KFBKePbY2Ipeac6lrChMKY=", "narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "4623a404c091e64743ba310199bb380ec52f1936", "rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -223,15 +276,16 @@
}, },
"libre-presenter": { "libre-presenter": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "cargo2nix": "cargo2nix",
"nixpkgs": "nixpkgs" "flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1669935777, "lastModified": 1671049146,
"narHash": "sha256-91bZy5Hl9dDiUGnpxC8kZoH/1i9dz8U4DbwnOnqAg6o=", "narHash": "sha256-WvBFHafvHxbxTvPBp+iJbeu1FnB+APvSFcTVvTmmRDE=",
"owner": "chriscochrun", "owner": "chriscochrun",
"repo": "church-presenter", "repo": "church-presenter",
"rev": "766dc02b917b48652aa3fcc925af6ace4073d363", "rev": "a30993c0bef6a12dc52e43b0e1cbc26b563fb677",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -243,8 +297,8 @@
"nix-bitcoin": { "nix-bitcoin": {
"inputs": { "inputs": {
"extra-container": "extra-container", "extra-container": "extra-container",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_3",
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable"
}, },
"locked": { "locked": {
@ -264,27 +318,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1666282307, "lastModified": 1654275867,
"narHash": "sha256-O1T2HGLARLKDLfdOmjPBfn3eC4cSIaQD71wUN4I/6/s=", "narHash": "sha256-pt14ZE4jVPGvfB2NynGsl34pgXfOqum5YJNpDK4+b9E=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b7d8c687782c8f9a1d425a7e486eb989654f6468", "rev": "7a20c208aacf4964c19186dcad51f89165dc7ed0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "release-22.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1670083709, "lastModified": 1670980281,
"narHash": "sha256-UL4czXyVoKSCqAbNkfJEu2M+XhIVNwBGkyDt+UbtA5E=", "narHash": "sha256-g0t/SmQca/JBEd+3Ry1qFgDfDK8ME9AM6EP4YUl8/lo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e09913998d89659044c29ef5df4a86542e78a2ef", "rev": "5cb48ea3c19ce2e5746a44d6b91847396bd28c1f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -311,6 +365,22 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1670507980,
"narHash": "sha256-riNZa0xzM1it3pzxciwALeMs+0CsBMWIW2FqulzK8vM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2787fc7d1e51404678614bf0fe92fc296746eec0",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1669418739, "lastModified": 1669418739,
"narHash": "sha256-T86oFvcUIRwHWBWUt7WjaP4BP/3lDGbv5AppQSI1FkI=", "narHash": "sha256-T86oFvcUIRwHWBWUt7WjaP4BP/3lDGbv5AppQSI1FkI=",
@ -326,13 +396,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1670064435, "lastModified": 1670929434,
"narHash": "sha256-+ELoY30UN+Pl3Yn7RWRPabykwebsVK/kYE9JsIsUMxQ=", "narHash": "sha256-n5UBO6XBV4h3TB7FYu2yAuNQMEYOrQyKeODUwKe06ow=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "61a8a98e6d557e6dd7ed0cdb54c3a3e3bbc5e25c", "rev": "1710ed1f6f8ceb75cf7d1cf55ee0cc21760e1c7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -350,7 +420,7 @@
"hyprland": "hyprland", "hyprland": "hyprland",
"libre-presenter": "libre-presenter", "libre-presenter": "libre-presenter",
"nix-bitcoin": "nix-bitcoin", "nix-bitcoin": "nix-bitcoin",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
} }
}, },
@ -376,6 +446,33 @@
"type": "github" "type": "github"
} }
}, },
"rust-overlay_2": {
"inputs": {
"flake-utils": [
"libre-presenter",
"cargo2nix",
"flake-utils"
],
"nixpkgs": [
"libre-presenter",
"cargo2nix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1653878966,
"narHash": "sha256-T51Gck/vrJZi1m+uTbhEFTRgZmE59sydVONadADv358=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "8526d618af012a923ca116be9603e818b502a8db",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
@ -418,11 +515,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1670202338, "lastModified": 1670892912,
"narHash": "sha256-StTfshdAoSxO+t0wRbq1I3YESLFIQWFjGJse5ICV8rk=", "narHash": "sha256-HC1qHrGXivdzNlWuuWcxX/P7OkNrlLbhzaqLx0mslPA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "af840a9e0947a79a37a95a9f62062653721e43fa", "rev": "9fb4fae94b9bd80395c193dcaf6fdf740550cff1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -11,10 +11,6 @@
package = pkgs.nixVersions.unstable; package = pkgs.nixVersions.unstable;
}; };
nixpkgs.config.permittedInsecurePackages = [
"qtwebkit-5.212.0-alpha4"
];
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot = { boot = {
@ -100,7 +96,7 @@
displayManager = { displayManager = {
startx.enable = true; startx.enable = true;
sddm = { sddm = {
enable = true; enable = false;
}; };
session = [ session = [
{ {
@ -121,15 +117,15 @@
}; };
services.greetd = { services.greetd = {
enable = false; enable = true;
settings = rec { settings = rec {
initial_session = { initial_session = {
command = "dbus-launch systemctl --user restart plasma-run-with-systemd.service"; command = "/home/chris/bin/hyprland";
user = "chris"; user = "chris";
}; };
default_session = initial_session; default_session = initial_session;
hyprland_session = { hyprland_session = {
command = "/home/chris/bin/hyprland"; command = "dbus-launch systemctl --user restart plasma-run-with-systemd.service";
user = "chris"; user = "chris";
}; };
}; };
@ -294,7 +290,7 @@
python310Packages.audiotools python310Packages.audiotools
mpv mpv
nerdfonts nerdfonts
latte-dock # latte-dock
plasma-browser-integration plasma-browser-integration
alacritty alacritty
libsForQt5.bismuth libsForQt5.bismuth
@ -382,32 +378,32 @@
(callPackage /home/chris/.dotfiles/ydotool {}) (callPackage /home/chris/.dotfiles/ydotool {})
# android-tools # android-tools
nix-index nix-index
meson # meson
ninja # ninja
gnumake # gnumake
gcc # gcc
gdb # gdb
clang # clang
clang-tools # clang-tools
cmake # cmake
qtcreator # qtcreator
extra-cmake-modules # extra-cmake-modules
pkg-config # pkg-config
libsForQt5.wrapQtAppsHook # libsForQt5.wrapQtAppsHook
python310Packages.pyqt5 # python310Packages.pyqt5
# LIBRARIES FOR DEV # LIBRARIES FOR DEV
qt5.qtbase # qt5.qtbase
qt5.qtquickcontrols2 # qt5.qtquickcontrols2
qt5.qtx11extras # qt5.qtx11extras
libsForQt5.appstream-qt # libsForQt5.appstream-qt
libsForQt5.kdelibs4support # libsForQt5.kdelibs4support
libsForQt5.kirigami2 # libsForQt5.kirigami2
libsForQt5.ki18n # libsForQt5.ki18n
libsForQt5.kcoreaddons # libsForQt5.kcoreaddons
# plasma5Packages.kirigami2 # plasma5Packages.kirigami2
sqlite sqlite
fennel fennel
(libsForQt5.callPackage /home/chris/dev/LightlyShaders {}) # (libsForQt5.callPackage /home/chris/dev/LightlyShaders {})
# (libsForQt5.callPackage /home/chris/dev/church-presenter {}) # (libsForQt5.callPackage /home/chris/dev/church-presenter {})
]; ];

View file

@ -11,10 +11,6 @@
package = pkgs.nixVersions.unstable; package = pkgs.nixVersions.unstable;
}; };
nixpkgs.config.permittedInsecurePackages = [
"qtwebkit-5.212.0-alpha4"
];
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot.kernelPackages = pkgs.linuxPackages_zen; boot.kernelPackages = pkgs.linuxPackages_zen;
@ -93,7 +89,7 @@
displayManager = { displayManager = {
startx.enable = true; startx.enable = true;
sddm = { sddm = {
enable = true; enable = false;
}; };
session = [ session = [
{ {
@ -114,15 +110,15 @@
}; };
services.greetd = { services.greetd = {
enable = false; enable = true;
settings = rec { settings = rec {
initial_session = { initial_session = {
command = "dbus-launch systemctl --user restart plasma-run-with-systemd.service"; command = "/home/chris/bin/hyprland";
user = "chris"; user = "chris";
}; };
default_session = initial_session; default_session = initial_session;
hyprland_session = { hyprland_session = {
command = "/home/chris/bin/hyprland"; command = "dbus-launch systemctl --user restart plasma-run-with-systemd.service";
user = "chris"; user = "chris";
}; };
}; };
@ -313,7 +309,7 @@
python310Packages.audiotools python310Packages.audiotools
mpv mpv
nerdfonts nerdfonts
latte-dock # latte-dock
plasma-browser-integration plasma-browser-integration
alacritty alacritty
libsForQt5.bismuth libsForQt5.bismuth
@ -402,32 +398,32 @@
# Dev tools # Dev tools
# android-tools # android-tools
nix-index nix-index
meson # meson
ninja # ninja
gnumake # gnumake
gcc # gcc
gdb # gdb
clang # clang
clang-tools # clang-tools
cmake # cmake
qtcreator # qtcreator
extra-cmake-modules # extra-cmake-modules
pkg-config # pkg-config
libsForQt5.wrapQtAppsHook # libsForQt5.wrapQtAppsHook
python310Packages.pyqt5 # python310Packages.pyqt5
# LIBRARIES FOR DEV # LIBRARIES FOR DEV
qt5.qtbase # qt5.qtbase
qt5.qtquickcontrols2 # qt5.qtquickcontrols2
qt5.qtx11extras # qt5.qtx11extras
libsForQt5.appstream-qt # libsForQt5.appstream-qt
libsForQt5.kdelibs4support # libsForQt5.kdelibs4support
libsForQt5.kirigami2 # libsForQt5.kirigami2
libsForQt5.ki18n # libsForQt5.ki18n
libsForQt5.kcoreaddons # libsForQt5.kcoreaddons
# plasma5Packages.kirigami2 # plasma5Packages.kirigami2
sqlite sqlite
fennel fennel
(libsForQt5.callPackage /home/chris/dev/LightlyShaders {}) # (libsForQt5.callPackage /home/chris/dev/LightlyShaders {})
# (libsForQt5.callPackage /home/chris/dev/church-presenter {}) # (libsForQt5.callPackage /home/chris/dev/church-presenter {})
]; ];