Skip to content

Commit

Permalink
adjust emoji package, flake naming, wrapper directory and small fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Keksgesicht committed Nov 1, 2023
1 parent 13e23a4 commit b0fcc8b
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 10 deletions.
2 changes: 1 addition & 1 deletion desktop/environment.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
packages = with pkgs; [
noto-fonts
noto-fonts-cjk
noto-fonts-emoji
noto-fonts-color-emoji
# Noto + NerdFont => Noto-Nerdfonts
(nerdfonts.override { fonts = [ "Noto" ]; })
# Microsoft TrueType core fonts
Expand Down
File renamed without changes.
7 changes: 7 additions & 0 deletions development/NixOS-wrappers/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{ config, ... }:

{
imports = [
./cage.nix
];
}
4 changes: 2 additions & 2 deletions development/default.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ config, pkgs, ... }:
{ config, ... }:

{
imports = [
./base-devel.nix
./desktop.nix
./neovim.nix
./nix-cage.nix
./NixOS-wrappers
];
}
2 changes: 1 addition & 1 deletion files/packages/files-cleanup/bin/cleanup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ rm -r /home/*/.var/app/org.mozilla.firefox/cache

### delete temporary flatpak overrides
### they are now managed by nix
### /var/lib/flatpak/overrides -> /etc/flatpak/overrides -> pkgs.flatpak-overrides
### /var/lib/flatpak/overrides -> pkgs.flatpak-overrides
rm -fr /home/*/.local/share/flatpak/overrides

### delete old Tab Group backups
Expand Down
17 changes: 11 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@
nixpkgs-stable.url = "nixpkgs/nixos-23.05";
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";

home-manager = {
#url = "github:nix-community/home-manager/release-23.05";
home-manager-stable = {
url = "github:nix-community/home-manager/release-23.05";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
home-manager-unstable = {
url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};

tuxedo-nixos = {
url = "github:blitz/tuxedo-nixos";
inputs.nixpkgs.follows = "nixpkgs-unstable";
Expand All @@ -22,9 +26,10 @@
self,
nixpkgs-stable,
nixpkgs-unstable,
home-manager,
home-manager-stable,
home-manager-unstable,
lanzaboote,
tuxedo-nixos
tuxedo-nixos,
}@inputs: {
nixosConfigurations = {

Expand All @@ -40,7 +45,7 @@
};
modules = [
./machines/cookieclicker.nix
home-manager.nixosModules.home-manager
home-manager-unstable.nixosModules.home-manager
lanzaboote.nixosModules.lanzaboote
];
};
Expand All @@ -56,7 +61,7 @@
};
modules = [
./machines/cookiethinker.nix
home-manager.nixosModules.home-manager
home-manager-unstable.nixosModules.home-manager
tuxedo-nixos.nixosModules.default
lanzaboote.nixosModules.lanzaboote
];
Expand Down
1 change: 1 addition & 0 deletions services/system/files-cleanup.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"-/root/.dbus"
"-/root/.local"
"-/home/keks/.cache"
"-/home/keks/.local/share/flatpak/overrides"
"-/home/keks/.var/app/io.gitlab.librewolf-community/cache"
"-/home/keks/.var/app/org.kde.kdenlive/cache"
"-/home/keks/.var/app/org.mozilla.firefox/cache"
Expand Down

0 comments on commit b0fcc8b

Please sign in to comment.