nki/nix-home
1
0
Fork 0
Code Issues Pull requests 1 Packages Projects Releases Wiki Activity

Move nki-home to unstable and enable blur!

Browse source
This commit is contained in:
Natsu Kagami 2023-04-19 01:09:20 +02:00
parent c63b5762dd
commit eaf390c642
Signed by: nki
GPG key ID: 7306B3D3C3AD6E51
6 changed files with 48 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
flake.lock
View file

@ -265,7 +265,7 @@
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nixpkgs"
"nixpkgs-unstable"
]
},
"locked": {
@ -327,14 +327,16 @@
},
"nix-gaming": {
"inputs": {
"nixpkgs": "nixpkgs_3"
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1678139301,
"narHash": "sha256-RLabMb1YvI5hmlQLD/YdUU9Y7gH0XJGTUNrPBq8ZGtY=",
"lastModified": 1681779687,
"narHash": "sha256-pTv3fJHb4BAqGZRu6xQU/wwL6CilmHvCUK8qaTOpEgY=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "a54e76782639df4e752b2388938d271f43f9e2e6",
"rev": "299ee41e7bec178507e1623f9b55036ef457379a",
"type": "github"
},
"original": {
@ -346,7 +348,7 @@
"nixos-m1": {
"inputs": {
"nixpkgs": [
"nixpkgs-unstable"
"nixpkgs-unstable-asahi"
],
"rust-overlay": "rust-overlay_2"
},
@ -397,6 +399,22 @@
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1681753173,
"narHash": "sha256-MrGmzZWLUqh2VstoikKLFFIELXm/lsf/G9U9zR96VD4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0a4206a51b386e5cda731e8ac78d76ad924c7125",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable-asahi": {
"locked": {
"lastModified": 1681740123,
"narHash": "sha256-RrcHEqm+f04nFpQQSnsGsUhJb2mNuqfdcGWL2DREEaY=",
@ -444,22 +462,6 @@
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1677995890,
"narHash": "sha256-eOnCn0o3I6LP48fAi8xWFcn49V2rL7oX5jCtJTeN1LI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a1240f6b4a0bcc84fc48008b396a140d9f3638f6",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1680122840,
"narHash": "sha256-zCQ/9iFHzCW5JMYkkHMwgK1/1/kTMgCMHq4THPINpAU=",
@ -475,7 +477,7 @@
"type": "github"
}
},
"nixpkgs_5": {
"nixpkgs_4": {
"locked": {
"lastModified": 1656753965,
"narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=",
@ -509,7 +511,7 @@
"rnix-lsp": {
"inputs": {
"naersk": "naersk",
"nixpkgs": "nixpkgs_5",
"nixpkgs": "nixpkgs_4",
"utils": "utils_4"
},
"locked": {
@ -539,8 +541,9 @@
"mpd-mpris": "mpd-mpris",
"nix-gaming": "nix-gaming",
"nixos-m1": "nixos-m1",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_3",
"nixpkgs-unstable": "nixpkgs-unstable",
"nixpkgs-unstable-asahi": "nixpkgs-unstable-asahi",
"nur": "nur",
"rnix-lsp": "rnix-lsp",
"secrets": "secrets",
@ -639,11 +642,11 @@
]
},
"locked": {
"lastModified": 1679331631,
"narHash": "sha256-tMoiwFO/AVTV7GoGMSu3XQimFnK8vv3yzf+D41kTJoE=",
"lastModified": 1681859040,
"narHash": "sha256-fjYYZG35AfePm1VKz4J3J2cbDP1Tu7EIeZnl2cHPKCQ=",
"owner": "WillPower3309",
"repo": "swayfx",
"rev": "7d5d7a3022eb17835cea7af7290b1a5d2fe4b03a",
"rev": "3f00052a9060764104c0fe1207640c870aea1290",
"type": "github"
},
"original": {

20
flake.nix
View file

@ -3,7 +3,8 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
nixpkgs-unstable.url = "github:natsukagami/nixpkgs/nixpkgs-unstable";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nixpkgs-unstable-asahi.url = "github:natsukagami/nixpkgs/nixpkgs-unstable";
# nixpkgs-unstable.follows = "nixos-m1/nixpkgs";
darwin.url = "github:lnl7/nix-darwin/master";
darwin.inputs.nixpkgs.follows = "nixpkgs-unstable";
@ -27,13 +28,14 @@
youmubot.url = "github:natsukagami/youmubot";
youmubot.inputs.nixpkgs.follows = "nixpkgs";
nix-gaming.url = github:fufexan/nix-gaming;
nix-gaming.inputs.nixpkgs.follows = "nixpkgs-unstable";
swayfx = {
url = github:WillPower3309/swayfx;
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
mpd-mpris = {
url = github:natsukagami/mpd-mpris/nix;
inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
# --- Sources
@ -42,7 +44,7 @@
kak-lsp.url = github:natsukagami/kak-lsp/show-message-request;
kak-lsp.flake = false;
nixos-m1.url = github:tpwrules/nixos-apple-silicon;
nixos-m1.inputs.nixpkgs.follows = "nixpkgs-unstable";
nixos-m1.inputs.nixpkgs.follows = "nixpkgs-unstable-asahi";
# ---
# DEPLOYMENT ONLY! secrets
@ -133,19 +135,19 @@
};
# Home configuration
nixosConfigurations."nki-home" = nixpkgs.lib.nixosSystem rec {
nixosConfigurations."nki-home" = nixpkgs-unstable.lib.nixosSystem rec {
system = "x86_64-linux";
modules = [
(common-nixos nixpkgs)
(common-nixos nixpkgs-unstable)
./nki-home/configuration.nix
enableOsuStable
home-manager.nixosModules.home-manager
inputs.home-manager-unstable.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.nki = { ... }: {
imports = [
inputs.mpd-mpris.homeManagerModules.default
# inputs.mpd-mpris.homeManagerModules.default
./home/kagami-pc-home.nix
];
};
@ -167,10 +169,10 @@
];
};
# macbook nixos
nixosConfigurations."kagami-air-m1" = nixpkgs-unstable.lib.nixosSystem rec {
nixosConfigurations."kagami-air-m1" = inputs.nixpkgs-unstable-asahi.lib.nixosSystem rec {
system = "aarch64-linux";
modules = [
(common-nixos nixpkgs)
(common-nixos inputs.nixpkgs-unstable-asahi)
inputs.nixos-m1.nixosModules.apple-silicon-support
./kagami-air-m1/configuration.nix
inputs.home-manager-unstable.nixosModules.home-manager

2
home/modules/programs/my-kitty/default.nix
View file

@ -58,7 +58,7 @@ with lib;
# Background color and transparency
background =
if isNull cfg.background then {
background_opacity = "0.9";
background_opacity = "0.85";
dynamic_background_opacity = true;
} else {
background_image = "${cfg.background}";

5
home/modules/programs/my-sway/default.nix
View file

@ -109,7 +109,7 @@ in
config.wayland.windowManager.sway = mkIf cfg.enable {
enable = true;
package = pkgs.swayfx;
package = pkgs.swayfx-unwrapped;
systemdIntegration = true;
config = {
@ -338,6 +338,9 @@ in
default_dim_inactive 0.0
for_window [app_id="kitty"] dim_inactive 0.05
titlebar_separator enable
# Blur
for_window [app_id=".*kitty.*"] blur enabled
blur_xray enabled
'' + ''
# Enable portal stuff
exec ${pkgs.writeShellScript "start-portals.sh" ''

3
nki-home/hardware-configuration.nix
View file

@ -29,9 +29,6 @@
swapDevices =
[{ device = "/dev/disk/by-uuid/561f6441-1915-4059-a5e1-76a449b0c9bf"; }];
# high-resolution display
hardware.video.hidpi.enable = lib.mkDefault true;
# GPU options
services.xserver.videoDrivers = [ "amdgpu" ];
hardware.opengl.enable = true;

3
overlay.nix
View file

@ -53,8 +53,6 @@ let
overlay-asahi = inputs.nixos-m1.overlays.default;
in
[
inputs.swayfx.overlays.default
(import ./overlays/openrazer)
overlay-unstable
overlay-needs-unstable
@ -68,6 +66,7 @@ in
(import ./packages/common)
inputs.mpd-mpris.overlays.default
inputs.swayfx.overlays.default
# Bug fixes
] # we assign the overlay created before to the overlays of nixpkgs.