minor tweaks, update, format
This commit is contained in:
atagen
parent
3e5b3303c3
commit
3b592d37d0
9 changed files with 96 additions and 69 deletions
71
flake.lock
generated
71
flake.lock
generated
|
|
@ -218,11 +218,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1685662779,
|
||||
"narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
|
||||
"lastModified": 1687762428,
|
||||
"narHash": "sha256-DIf7mi45PKo+s8dOYF+UlXHzE0Wl/+k3tXUyAoAnoGE=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
|
||||
"rev": "37dd7bb15791c86d55c5121740a1887ab55ee836",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -236,11 +236,11 @@
|
|||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1687171271,
|
||||
"narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=",
|
||||
"lastModified": 1687709756,
|
||||
"narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c",
|
||||
"rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -319,11 +319,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1687530962,
|
||||
"narHash": "sha256-1YU3uObpJjUYv9kj0kzwYmNM/1c1pDdRsGGtPRuNk2M=",
|
||||
"lastModified": 1688052323,
|
||||
"narHash": "sha256-+CK2vB9ZN6dbbNL+2oKT8Opo+TLKEZ2u66RFZMG7LoU=",
|
||||
"owner": "helix-editor",
|
||||
"repo": "helix",
|
||||
"rev": "93ac70684437b2da4708a8e20c60ac31052138b3",
|
||||
"rev": "e0bb032f0e6dcc9b84e571c345928fba4054855e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -339,11 +339,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1687506590,
|
||||
"narHash": "sha256-CSou9mrG9h/WVRjCptfTrATVxvhmtdQXElmWV/ZkrAs=",
|
||||
"lastModified": 1687969886,
|
||||
"narHash": "sha256-tC2qFLmuM0PFaw0tMHVcFmzsG/351q09qa1EpuL2n1U=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "d2b6f2d154bf6b27a93ed895392f80c503df7cfa",
|
||||
"rev": "a7002d6bfca54742d5fc9b485a1879953b4585b9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -360,11 +360,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1687521241,
|
||||
"narHash": "sha256-7UtJ6mmz5NidH+5yeEXWZRHLPAeMbVx2M4aQFuOS8Sk=",
|
||||
"lastModified": 1688073610,
|
||||
"narHash": "sha256-afHapwWDtcTDNCrhQ/fwYOv1zDP8QTTpTA2txZExR2U=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "69fae18e636ed154798c21ed5c1127672127c6ac",
|
||||
"rev": "1012e2735a88188f43b11a9126e70977be1d2ab9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -513,11 +513,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1686592866,
|
||||
"narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=",
|
||||
"lastModified": 1687502512,
|
||||
"narHash": "sha256-dBL/01TayOSZYxtY4cMXuNCBk8UMLoqRZA+94xiFpJA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0eeebd64de89e4163f4d3cf34ffe925a5cf67a05",
|
||||
"rev": "3ae20aa58a6c0d1ca95c9b11f59a2d12eebc511f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -558,6 +558,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1687829761,
|
||||
"narHash": "sha256-QRe1Y8SS3M4GeC58F/6ajz6V0ZLUVWX3ZAMgov2N3/g=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9790f3242da2152d5aa1976e3e4b8b414f4dd206",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-23.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgsV1": {
|
||||
"locked": {
|
||||
"lastModified": 1678500271,
|
||||
|
|
@ -591,11 +607,11 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1687412861,
|
||||
"narHash": "sha256-Z/g0wbL68C+mSGerYS2quv9FXQ1RRP082cAC0Bh4vcs=",
|
||||
"lastModified": 1687898314,
|
||||
"narHash": "sha256-B4BHon3uMXQw8ZdbwxRK1BmxVOGBV4viipKpGaIlGwk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e603dc5f061ca1d8a19b3ede6a8cf9c9fcba6cdc",
|
||||
"rev": "e18dc963075ed115afb3e312b64643bf8fd4b474",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -607,11 +623,11 @@
|
|||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1687517250,
|
||||
"narHash": "sha256-ljok9lDztDPtoOIqloqQk3hjgkCaqvPUahGev0BV8rM=",
|
||||
"lastModified": 1688094967,
|
||||
"narHash": "sha256-lulaWUPtEiMM2wOKtVgdCCNKsGjY7YiWAJCDd9dw6Mk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "de92a89de58f918bdd6039521146c545e4f01a0d",
|
||||
"rev": "1bd65cd2ad9c4660333ebab2d2e8c7d733e3e60c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -679,6 +695,7 @@
|
|||
"nix-rice": "nix-rice",
|
||||
"nix-std": "nix-std",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixpkgs-stable": "nixpkgs-stable_2",
|
||||
"nur": "nur",
|
||||
"rust-overlay": "rust-overlay_2"
|
||||
}
|
||||
|
|
@ -715,11 +732,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1687400833,
|
||||
"narHash": "sha256-rVENiSupjAE8o1+ZXNRIqewUzM2brm+aeme8MUrwl0U=",
|
||||
"lastModified": 1688092301,
|
||||
"narHash": "sha256-NTgT955DzXWVjHsuBn1t2K0x4hUghY7uE1jG2nGL5R4=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "fc0a266e836c079a9131108f4334e5af219dbb93",
|
||||
"rev": "4c31223801dd0f28ac15d60f2e5ddbd4d51ce17a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.05";
|
||||
|
||||
flake-parts = {
|
||||
url = "github:hercules-ci/flake-parts";
|
||||
|
|
@ -52,6 +53,7 @@
|
|||
outputs = {
|
||||
self,
|
||||
nixpkgs,
|
||||
nixpkgs-stable,
|
||||
home-manager,
|
||||
nur,
|
||||
eww,
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ bindm=SUPER,mouse:273,resizewindow
|
|||
bind=SUPER,Return,exec,kitty
|
||||
bind=SUPER,E,exec,thunar
|
||||
bind=SUPER,F,exec,firefox
|
||||
bind=SUPER,F,exec,nyxt
|
||||
bind=SUPER_SHIFT,F,exec,nyxt
|
||||
bind=SUPER,D,exec,fuzzel
|
||||
bind=SUPER,N,exec,swaync-client -t
|
||||
|
||||
|
|
|
|||
|
|
@ -72,6 +72,13 @@ in {
|
|||
++ pkgs.rice.fonts.pkgs
|
||||
++ pkgs.rice.icons.pkgs;
|
||||
|
||||
systemd.user.targets.tray = {
|
||||
Unit = {
|
||||
Description = "Home Manager System Tray";
|
||||
Requires = ["graphical-session-pre.target"];
|
||||
};
|
||||
};
|
||||
|
||||
fonts.fontconfig.enable = true;
|
||||
|
||||
services.syncthing = {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,15 @@
|
|||
{inputs, ...}: {
|
||||
additions = final: _prev: import ./pkgs {pkgs = final;};
|
||||
unstable-pkgs = final: _prev: {
|
||||
pkg-sets = final: _prev: {
|
||||
unstable = import inputs.nixpkgs {
|
||||
system = final.system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
stable = import inputs.nixpkgs-stable {
|
||||
system = final.system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
};
|
||||
rice = import ./rice.nix;
|
||||
podman-stable = final: prev: {podman-stable = final.stable.podman;};
|
||||
}
|
||||
|
|
|
|||
28
pkgs/eww.nix
28
pkgs/eww.nix
|
|
@ -1,14 +1,14 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, gtk3
|
||||
, gdk-pixbuf
|
||||
, withWayland ? true
|
||||
, gtk-layer-shell
|
||||
, stdenv
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
gtk3,
|
||||
gdk-pixbuf,
|
||||
withWayland ? true,
|
||||
gtk-layer-shell,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "eww";
|
||||
version = "0.4.0-dirty";
|
||||
|
|
@ -24,14 +24,14 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
# cargoPatches = [ ./Cargo.lock.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [pkg-config];
|
||||
|
||||
buildInputs = [ gtk3 gdk-pixbuf ] ++ lib.optional withWayland gtk-layer-shell;
|
||||
buildInputs = [gtk3 gdk-pixbuf] ++ lib.optional withWayland gtk-layer-shell;
|
||||
|
||||
buildNoDefaultFeatures = withWayland;
|
||||
buildFeatures = lib.optional withWayland "wayland";
|
||||
|
||||
cargoBuildFlags = [ "--bin" "eww" ];
|
||||
cargoBuildFlags = ["--bin" "eww"];
|
||||
|
||||
cargoTestFlags = cargoBuildFlags;
|
||||
|
||||
|
|
@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "ElKowars wacky widgets";
|
||||
homepage = "https://github.com/elkowar/eww";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda lom ];
|
||||
maintainers = with maintainers; [figsoda lom];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
|
||||
imports = [
|
||||
./configuration.nix
|
||||
];
|
||||
|
|
@ -67,7 +66,6 @@
|
|||
};
|
||||
};
|
||||
|
||||
|
||||
services.xserver.videoDrivers = ["i915"];
|
||||
programs.xwayland.enable = true;
|
||||
|
||||
|
|
@ -94,23 +92,23 @@
|
|||
"system76-scheduler".source = "${pkgs.linuxPackages.system76-scheduler}/etc/system76-scheduler";
|
||||
};
|
||||
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
wlr = {
|
||||
enable = true;
|
||||
# settings = {
|
||||
# screencast = {
|
||||
# output_name = "DP-1";
|
||||
# max_fps = 60;
|
||||
# chooser_type = "simple";
|
||||
# chooser_nvidia = "${pkgs.slurp}/bin/slurp -f %o -or";
|
||||
# };
|
||||
# };
|
||||
};
|
||||
extraPortals = with pkgs; [
|
||||
xdg-desktop-portal-gtk
|
||||
];
|
||||
};
|
||||
# xdg.portal = {
|
||||
# enable = true;
|
||||
# wlr = {
|
||||
# enable = true;
|
||||
# # settings = {
|
||||
# # screencast = {
|
||||
# # output_name = "DP-1";
|
||||
# # max_fps = 60;
|
||||
# # chooser_type = "simple";
|
||||
# # chooser_nvidia = "${pkgs.slurp}/bin/slurp -f %o -or";
|
||||
# # };
|
||||
# # };
|
||||
# };
|
||||
# extraPortals = with pkgs; [
|
||||
# xdg-desktop-portal-gtk
|
||||
# ];
|
||||
# };
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
openrgb
|
||||
|
|
|
|||
|
|
@ -12,7 +12,8 @@
|
|||
overlays = [
|
||||
inputs.nur.overlay
|
||||
outputs.overlays.additions
|
||||
outputs.overlays.unstable-pkgs
|
||||
outputs.overlays.pkg-sets
|
||||
outputs.overlays.podman-stable
|
||||
inputs.nix-rice.overlays.default
|
||||
outputs.overlays.rice
|
||||
];
|
||||
|
|
@ -108,6 +109,7 @@
|
|||
bind=,Escape,exec,wlogout
|
||||
bind=SUPER_SHIFT,e,exec,wlogout
|
||||
env = GTK_THEME,nix-rice
|
||||
exec = swaybg -i ${bg.image} -m fill
|
||||
exec = ${pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY
|
||||
exec = gsettings set org.gnome.desktop.interface gtk-theme '${gtk-theme.name}'
|
||||
exec = gsettings set org.gnome.desktop.interface font-name '${fonts.sans.name}'
|
||||
|
|
@ -128,7 +130,6 @@
|
|||
};
|
||||
};
|
||||
|
||||
|
||||
security.polkit.enable = true;
|
||||
|
||||
programs.dconf.enable = true;
|
||||
|
|
@ -136,9 +137,6 @@
|
|||
xdg.autostart.enable = true;
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
wlr = {
|
||||
enable = true;
|
||||
};
|
||||
extraPortals = with pkgs; [
|
||||
xdg-desktop-portal-gtk
|
||||
];
|
||||
|
|
@ -198,7 +196,7 @@
|
|||
|
||||
curl
|
||||
exa
|
||||
uutils-coreutils
|
||||
swaybg
|
||||
|
||||
git
|
||||
|
||||
|
|
@ -209,7 +207,6 @@
|
|||
cachix
|
||||
|
||||
alejandra
|
||||
|
||||
];
|
||||
|
||||
documentation.dev.enable = true;
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@
|
|||
|
||||
virtualisation = {
|
||||
podman = {
|
||||
# package = pkgs.podman-stable;
|
||||
enable = true;
|
||||
dockerCompat = true;
|
||||
defaultNetwork.settings.dns_enabled = true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue