added hyprpanel, fixed colmena for laptop, and minor ssh config changes
This commit is contained in:
parent
61b4615aee
commit
9636eab7f6
6 changed files with 132 additions and 60 deletions
|
|
@ -6,7 +6,8 @@
|
|||
}: let
|
||||
home-manager = builtins.fetchTarball {
|
||||
url = "https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz";
|
||||
sha256 = "15k41il0mvmwyv6jns4z8k6khhmb22jk5gpcqs1paym3l01g6abn";
|
||||
sha256 = "0c07xj74vsj37d3a8f98i9rhhhr99ckwlp45n40f0qkmigm3pk8s";
|
||||
#sha256 = "15k41il0mvmwyv6jns4z8k6khhmb22jk5gpcqs1paym3l01g6abn";
|
||||
};
|
||||
in {
|
||||
imports = [
|
||||
|
|
@ -37,7 +38,7 @@ in {
|
|||
efiSupport = true;
|
||||
#efiInstallAsRemovable = true; # in case canTouchEfiVariables doesn't work on this system
|
||||
device = "nodev";
|
||||
useOSProber = true;
|
||||
useOSProber = false;
|
||||
};
|
||||
# GitHub: vinceliuice/grub2-themes
|
||||
grub2-theme = {
|
||||
|
|
@ -118,19 +119,34 @@ in {
|
|||
isNormalUser = true;
|
||||
extraGroups = ["wheel"];
|
||||
shell = pkgs.bash; #pkgs.fish
|
||||
packages = with pkgs; [
|
||||
firefox
|
||||
nitch
|
||||
starfetch
|
||||
packages = let
|
||||
# TODO: can I just do this: https://nix.dev/manual/nix/2.18/command-ref/new-cli/nix3-flake#url-like-syntax
|
||||
# instead to use colmena's flake.nix by specifying a rev hash in the flake input?
|
||||
colmena-src = pkgs.fetchFromGitHub {
|
||||
owner = "zhaofengli";
|
||||
repo = "colmena";
|
||||
rev = "47b6414d800c8471e98ca072bc0835345741a56a";
|
||||
sha256 = "rINodqeUuezuCWOnpJgrH7u9vJ86fYT+Dj8Mu8T/IBc=";
|
||||
};
|
||||
colmena-latest = pkgs.callPackage "${colmena-src}/package.nix" {};
|
||||
in
|
||||
with pkgs; [
|
||||
firefox
|
||||
nitch
|
||||
starfetch
|
||||
|
||||
# flatpak requires gnome-software
|
||||
# for graphical applications
|
||||
flatpak
|
||||
gnome-software
|
||||
hyprpanel
|
||||
|
||||
jetbrains.rider
|
||||
gitkraken
|
||||
];
|
||||
# flatpak requires gnome-software
|
||||
# for graphical applications
|
||||
flatpak
|
||||
gnome-software
|
||||
|
||||
colmena-latest
|
||||
|
||||
jetbrains.rider
|
||||
gitkraken
|
||||
];
|
||||
};
|
||||
|
||||
# user for my professional jobs and stuff
|
||||
|
|
@ -163,10 +179,11 @@ in {
|
|||
|
||||
home-manager = {
|
||||
users.me = import ../../homes/me;
|
||||
#extraSpecialArgs = {inherit inputs pkgs;};
|
||||
sharedModules = [
|
||||
inputs.nixcord.homeManagerModules.nixcord
|
||||
inputs.ags.homeManagerModules.default
|
||||
{nixpkgs.overlays = [inputs.hyprpanel.overlay];}
|
||||
inputs.nixcord.homeManagerModules.nixcord
|
||||
#{nixpkgs.overlays = [inputs.hyprpanel.overlay];}
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -180,13 +197,16 @@ in {
|
|||
wl-clipboard # clipboard for wayland
|
||||
pavucontrol
|
||||
|
||||
(callPackage ./sddm-theme-corners.nix {}).sddm-theme-corners
|
||||
(callPackage ../sddm-theme-corners.nix {}).sddm-theme-corners
|
||||
# dependencies for my sddm theme:
|
||||
pkgs.libsForQt5.qt5.qtgraphicaleffects
|
||||
|
||||
python311 # I use 3.11 since it's in a pretty stable state now
|
||||
poetry # python dependency management and packaging
|
||||
|
||||
# DEBUG: using neofetch temporarily to see if my system upgrades properly
|
||||
neofetch
|
||||
|
||||
# fish plugins
|
||||
grc # colorise command outputs
|
||||
|
||||
|
|
@ -208,6 +228,7 @@ in {
|
|||
brightnessctl
|
||||
acpi
|
||||
vim
|
||||
powertop
|
||||
|
||||
# Unix Commands
|
||||
wget
|
||||
|
|
@ -219,8 +240,8 @@ in {
|
|||
programs = {
|
||||
hyprland = {
|
||||
enable = true;
|
||||
package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
|
||||
portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
|
||||
#package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
|
||||
#portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
|
||||
|
||||
xwayland.enable = true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ in {
|
|||
rev = "47b6414d800c8471e98ca072bc0835345741a56a";
|
||||
sha256 = "rINodqeUuezuCWOnpJgrH7u9vJ86fYT+Dj8Mu8T/IBc=";
|
||||
};
|
||||
colmena-new = pkgs.callPackage "${colmena-src}/package.nix" {};
|
||||
colmena-latest = pkgs.callPackage "${colmena-src}/package.nix" {};
|
||||
in
|
||||
with pkgs; [
|
||||
firefox
|
||||
|
|
@ -132,7 +132,7 @@ in {
|
|||
flatpak
|
||||
gnome-software
|
||||
|
||||
colmena-new
|
||||
colmena-latest
|
||||
|
||||
gitkraken
|
||||
# NOTE: downloadthing this causes my PC to freak!! ("too many open files" error)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue