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

Update lots of things to 23.05!!

Browse source
This commit is contained in:
Natsu Kagami 2023-06-03 13:39:55 +02:00
parent f132e137e0
commit ee6463ed3d
Signed by: nki
GPG key ID: 55A032EB38B49ADB
7 changed files with 51 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/deploy.yml vendored
View file

@ -22,6 +22,9 @@ jobs:
extra_nix_config: |
# Enable flakes
experimental-features = nix-command flakes
# Import my substituters
extra-substituters = "https://natsukagami.cachix.org"
trusted-public-keys = "natsukagami.cachix.org-1:3U6GV8i8gWEaXRUuXd2S4ASfYgdl2QFPWg4BKPbmYiQ="
- name: Run format check
run: |
nix fmt

103
flake.lock
View file

@ -246,20 +246,19 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"utils": "utils_2"
]
},
"locked": {
"lastModified": 1670232440,
"narHash": "sha256-bPTUa2Vn+DAhkgQHh+1YbD77Ahu+p7PgmyRkc/dInCU=",
"owner": "natsukagami",
"lastModified": 1685599623,
"narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "63099f1b21ec4a18c8ab616bcbe7ed4bcdb640da",
"rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd",
"type": "github"
},
"original": {
"owner": "natsukagami",
"ref": "release-22.11",
"owner": "nix-community",
"ref": "release-23.05",
"repo": "home-manager",
"type": "github"
}
@ -269,7 +268,7 @@
"nixpkgs": [
"nixpkgs-unstable"
],
"utils": "utils_3"
"utils": "utils_2"
},
"locked": {
"lastModified": 1679786039,
@ -438,22 +437,6 @@
"type": "github"
}
},
"nixpkgs-mozilla": {
"flake": false,
"locked": {
"lastModified": 1664789696,
"narHash": "sha256-UGWJHQShiwLCr4/DysMVFrYdYYHcOqAOVsWNUu+l6YU=",
"owner": "mozilla",
"repo": "nixpkgs-mozilla",
"rev": "80627b282705101e7b38e19ca6e8df105031b072",
"type": "github"
},
"original": {
"owner": "mozilla",
"repo": "nixpkgs-mozilla",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1683442750,
@ -470,21 +453,6 @@
"type": "github"
}
},
"nixpkgs-unstable_2": {
"locked": {
"lastModified": 1665934222,
"narHash": "sha256-EIPSpN/LMWcKO56KnCF9xJzIOeNU5bJ83ziSgd8I54Y=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1087d09dfbf82e086a54390b09b353365aaf8658",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1677655566,
@ -519,16 +487,16 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1680122840,
"narHash": "sha256-zCQ/9iFHzCW5JMYkkHMwgK1/1/kTMgCMHq4THPINpAU=",
"lastModified": 1685533922,
"narHash": "sha256-y4FCQpYafMQ42l1V+NUrMel9RtFtZo59PzdzflKR/lo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a575c243c23e2851b78c00e9fa245232926ec32f",
"rev": "3a70dd92993182f8e514700ccf5b1ae9fc8a3b8d",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-22.11",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
@ -549,6 +517,22 @@
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1685620773,
"narHash": "sha256-iQ+LmporQNdLz8uMJdP62TaAWeLUwl43/MYUBtWqulM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f0ba8235153dd2e25cf06cbf70d43efdd4443592",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"locked": {
"lastModified": 1678304776,
@ -568,7 +552,7 @@
"inputs": {
"naersk": "naersk",
"nixpkgs": "nixpkgs_5",
"utils": "utils_4"
"utils": "utils_3"
},
"locked": {
"lastModified": 1669555118,
@ -727,21 +711,6 @@
}
},
"utils_2": {
"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"
}
},
"utils_3": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
@ -756,7 +725,7 @@
"type": "github"
}
},
"utils_4": {
"utils_3": {
"locked": {
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
@ -775,18 +744,14 @@
"inputs": {
"flake-utils": "flake-utils_5",
"naersk": "naersk_2",
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-mozilla": "nixpkgs-mozilla",
"nixpkgs-unstable": "nixpkgs-unstable_2"
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1680449714,
"narHash": "sha256-r99MN5pxbbg+IuwMzFhR6QilBvtUYbYP5A5MYZojDk4=",
"lastModified": 1685786355,
"narHash": "sha256-4TGFvNYX9yBpRTCSkmqXj/hFOvifE2GtjmCajQNeFYs=",
"owner": "natsukagami",
"repo": "youmubot",
"rev": "147976f2cc6b7ffed14abaf9aab5d86b282402b0",
"rev": "e73247e7d401cbbcc96063ff4d01f97abb7eba7e",
"type": "github"
},
"original": {

9
flake.nix
View file

@ -2,12 +2,12 @@
description = "nki's systems";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
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:natsukagami/home-manager/release-22.11";
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";
@ -26,7 +26,6 @@
# Imported apps
rnix-lsp.url = "github:nix-community/rnix-lsp";
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 = {
@ -137,10 +136,10 @@
};
# Home configuration
nixosConfigurations."nki-home" = nixpkgs-unstable.lib.nixosSystem rec {
nixosConfigurations."nki-home" = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux";
modules = [
(common-nixos nixpkgs-unstable)
(common-nixos nixpkgs)
./nki-home/configuration.nix
enableOsuStable
inputs.home-manager-unstable.nixosModules.home-manager

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

@ -52,7 +52,6 @@ in
mailspring
# Chat stuff
unstable.slack
cinny-desktop
]));
nki.programs.discord.enable = pkgs.stdenv.isx86_64;

2
home/modules/programs/my-broot.nix
View file

@ -92,7 +92,7 @@ in
# Add an extra syntax_color config
xdg.configFile."broot/conf.toml".source = mkOverride 1 (
tomlFormat.generate "broot-config" (with config.programs.broot; {
inherit verbs modal skin;
inherit (settings) verbs modal skin;
syntax_theme = "base16-ocean.light";
})
);

5
nki-personal-do/configuration.nix
View file

@ -30,15 +30,16 @@
uid = 1000;
};
boot.cleanTmpDir = true;
boot.tmp.cleanOnBoot = true;
networking.hostName = "nki-personal";
networking.firewall.allowPing = true;
services.openssh.enable = true;
services.openssh.passwordAuthentication = false;
services.openssh.settings.PasswordAuthentication = false;
users.users.root.openssh.authorizedKeys.keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLr1Q+PJuDYJtBAVMSU0U2kZi4V0Z7dE+dpRxa4aEDupSlcPCwSEtcpNME1up7z0yxjcIHHkBYq0RobIaLqwEmntnZzz37jg/iiHwyZsN93jZljId1X0uykcMem4ljiqgmRg3Fs8RKj2+N1ovpIZVDOWINLJJDVJntNvwW/anSCtx27FATVdroHoiyXCwVknG6p3bHU5Nd3idRMn45kZ7Qf1J50XUhtu3ehIWI2/5nYIbi8WDnzY5vcRZEHROyTk2pv/m9rRkCTaGnUdZsv3wfxeeT3223k0mUfRfCsiPtNDGwXn66HcG2cmhrBIeDoZQe4XNkzspaaJ2+SGQfO8Zf natsukagami@gmail.com"
];
users.users.root.shell = pkgs.fish;
programs.fish.enable = true;
environment.systemPackages = with pkgs; [
git

11
nki-personal-do/gitea.nix
View file

@ -89,14 +89,15 @@ in
inherit user;
domain = host;
rootUrl = "https://${host}/";
httpAddress = "127.0.0.1";
httpPort = port;
appName = "DTTHgit";
settings = {
server = {
DOMAIN = host;
ROOT_URL = "https://${host}/";
HTTP_ADDRESS = "127.0.0.1";
HTTP_PORT = port;
};
repository = {
DEFAULT_PRIVATE = "private";
PREFERRED_LICENSES = strings.concatStringsSep "," [ "AGPL-3.0-or-later" "GPL-3.0-or-later" "Apache-2.0" ];