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

Update asahi to latest using 23.05

Browse source
This commit is contained in:
Natsu Kagami 2023-06-06 22:36:45 +02:00
parent 286f296de4
commit 20f296dc5e
Signed by: nki
GPG key ID: 7306B3D3C3AD6E51
6 changed files with 46 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
flake.lock
View file

@ -263,27 +263,6 @@
"type": "github"
}
},
"home-manager-unstable": {
"inputs": {
"nixpkgs": [
"nixpkgs-unstable"
],
"utils": "utils_2"
},
"locked": {
"lastModified": 1679786039,
"narHash": "sha256-VNjswu0Q4bZOkWNuc0+dHvRdjUCj+MnDlRfw/Q0R3vI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "cf662b6c98a0da81e06066fff0ecf9cbd4627727",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"kak-lsp": {
"flake": false,
"locked": {
@ -320,7 +299,7 @@
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nixpkgs-unstable"
"nixpkgs"
]
},
"locked": {
@ -383,7 +362,7 @@
"nix-gaming": {
"inputs": {
"nixpkgs": [
"nixpkgs-unstable"
"nixpkgs"
]
},
"locked": {
@ -403,21 +382,22 @@
"nixos-m1": {
"inputs": {
"nixpkgs": [
"nixpkgs-unstable"
"nixpkgs"
],
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1683434835,
"narHash": "sha256-idBmY6LKkB5hTcTFroUi1oQdCK1/fDfJA+qNaivl1Wk=",
"owner": "tpwrules",
"repo": "nixos-apple-silicon",
"rev": "ef6f0de57ef175e0de8c7e846a95481ac6f4ce58",
"lastModified": 1686079678,
"narHash": "sha256-WWeb8DQsjBwpLq60zSL6xXmidNGxw2AV5akbmQQdqoc=",
"owner": "natsukagami",
"repo": "nixos-m1",
"rev": "2661b50f74f1ade09139e166327bed62011e07bd",
"type": "github"
},
"original": {
"owner": "tpwrules",
"repo": "nixos-apple-silicon",
"owner": "natsukagami",
"ref": "update-versions",
"repo": "nixos-m1",
"type": "github"
}
},
@ -552,7 +532,7 @@
"inputs": {
"naersk": "naersk",
"nixpkgs": "nixpkgs_5",
"utils": "utils_3"
"utils": "utils_2"
},
"locked": {
"lastModified": 1669555118,
@ -576,7 +556,6 @@
"deploy-rs": "deploy-rs",
"flake-utils": "flake-utils_2",
"home-manager": "home-manager",
"home-manager-unstable": "home-manager-unstable",
"kak-lsp": "kak-lsp",
"kakoune": "kakoune",
"mpd-mpris": "mpd-mpris",
@ -678,7 +657,7 @@
"inputs": {
"flake-compat": "flake-compat_3",
"nixpkgs": [
"nixpkgs-unstable"
"nixpkgs"
]
},
"locked": {
@ -711,21 +690,6 @@
}
},
"utils_2": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_3": {
"locked": {
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",

23
flake.nix
View file

@ -4,13 +4,10 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
# nixpkgs-unstable.follows = "nixos-m1/nixpkgs";
darwin.url = "github:lnl7/nix-darwin/master";
darwin.inputs.nixpkgs.follows = "nixpkgs-unstable";
home-manager.url = "github:nix-community/home-manager/release-23.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
home-manager-unstable.url = "github:nix-community/home-manager";
home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable";
sops-nix.url = "github:Mic92/sops-nix";
sops-nix.inputs.nixpkgs.follows = "nixpkgs-unstable";
sops-nix.inputs.nixpkgs-stable.follows = "nixpkgs";
@ -27,14 +24,14 @@
rnix-lsp.url = "github:nix-community/rnix-lsp";
youmubot.url = "github:natsukagami/youmubot";
nix-gaming.url = github:fufexan/nix-gaming;
nix-gaming.inputs.nixpkgs.follows = "nixpkgs-unstable";
nix-gaming.inputs.nixpkgs.follows = "nixpkgs";
swayfx = {
url = github:WillPower3309/swayfx;
inputs.nixpkgs.follows = "nixpkgs-unstable";
inputs.nixpkgs.follows = "nixpkgs";
};
mpd-mpris = {
url = github:natsukagami/mpd-mpris/nix;
inputs.nixpkgs.follows = "nixpkgs-unstable";
inputs.nixpkgs.follows = "nixpkgs";
};
# --- Sources
@ -42,8 +39,8 @@
kakoune.flake = false;
kak-lsp.url = github:kak-lsp/kak-lsp;
kak-lsp.flake = false;
nixos-m1.url = github:tpwrules/nixos-apple-silicon;
nixos-m1.inputs.nixpkgs.follows = "nixpkgs-unstable";
nixos-m1.url = github:natsukagami/nixos-m1/update-versions;
nixos-m1.inputs.nixpkgs.follows = "nixpkgs";
# ---
# DEPLOYMENT ONLY! secrets
@ -129,7 +126,7 @@
modules = [
(common-nix nixpkgs-unstable)
./darwin/configuration.nix
inputs.home-manager-unstable.darwinModules.home-manager
inputs.home-manager.darwinModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
@ -145,7 +142,7 @@
(common-nixos nixpkgs)
./nki-home/configuration.nix
enableOsuStable
inputs.home-manager-unstable.nixosModules.home-manager
inputs.home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
@ -173,13 +170,13 @@
# ];
# };
# macbook nixos
nixosConfigurations."kagami-air-m1" = inputs.nixpkgs-unstable.lib.nixosSystem rec {
nixosConfigurations."kagami-air-m1" = inputs.nixpkgs.lib.nixosSystem rec {
system = "aarch64-linux";
modules = [
(common-nixos inputs.nixpkgs-unstable)
(common-nixos inputs.nixpkgs)
inputs.nixos-m1.nixosModules.apple-silicon-support
./kagami-air-m1/configuration.nix
inputs.home-manager-unstable.nixosModules.home-manager
inputs.home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;

13
home/modules/linux/graphical/default.nix
View file

@ -31,7 +31,6 @@ in
home.packages = (with pkgs; [
## GUI stuff
gnome.cheese # Webcam check
evince # PDF reader
gparted
vscode
@ -49,6 +48,7 @@ in
# sct # Display color temperature
xdg-utils # Open stuff
] ++ (if pkgs.stdenv.isAarch64 then [ ] else [
gnome.cheese # Webcam check, expensive
mailspring
# Chat stuff
unstable.slack
@ -56,6 +56,17 @@ in
nki.programs.discord.enable = pkgs.stdenv.isx86_64;
# Email
programs.thunderbird = {
enable = true;
profiles.default = {
isDefault = true;
};
settings = {
"privacy.donottrackheader.enabled" = true;
};
};
# Cursor
home.pointerCursor = {
package = pkgs.numix-cursor-theme;

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

@ -145,7 +145,6 @@ in
# Startup programs
{ command = "${cfg.browser}"; }
{ command = "thunderbird"; } # Rely on system package with plugins
{ command = "env PYTHONPATH=$(python -m site --user-site) ${pkgs.ulauncher}/bin/ulauncher --hide-window --no-window-shadow"; }
] ++ (if cfg.discord != null then [
{ command = "${cfg.discord}"; }
] ++ lib.lists.optional
@ -203,7 +202,7 @@ in
"${mod}+Shift+e" =
"exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'";
# Launcher
"${mod}+space" = "exec ${pkgs.ulauncher}/bin/ulauncher-toggle";
"${mod}+space" = "exec rofi -show drun";
} // {
## Splits
"${mod}+v" = "split v";
@ -691,8 +690,15 @@ in
qt5.qtwayland
# For waybar
font-awesome
# For launcher
ulauncher
]);
config.programs.rofi = mkIf cfg.enable {
enable = true;
package = pkgs.rofi-wayland;
cycle = true;
font = "monospace ${toString cfg.fontSize}";
terminal = cfg.terminal;
theme = "Paper";
plugins = with pkgs; [ rofi-bluetooth rofi-calc rofi-rbw rofi-power-menu ];
};
}

10
modules/common/linux/default.nix
View file

@ -220,16 +220,6 @@ in
hardware.opengl.enable = true;
hardware.opengl.driSupport = true;
hardware.opengl.driSupport32Bit = !pkgs.stdenv.isAarch64; # For 32 bit applications
# Email
programs.thunderbird = {
enable = true;
profiles.default = {
isDefault = true;
};
settings = {
"privacy.donottrackheader.enabled" = true;
};
};
## Services
# gnome-keyring for storing keys

4
overlay.nix
View file

@ -17,9 +17,7 @@ let
sources = final.lib.attrsets.filterAttrs (name: f: !(builtins.hasAttr "outputs" f)) inputs;
};
overlay-versioning = final: prev: {
ulauncher = prev.ulauncher.override { webkitgtk = final.webkitgtk_4_1; };
};
overlay-versioning = final: prev: { };
overlay-libs = final: prev: {
libs.crane = inputs.crane.lib.${prev.system};