This commit is contained in:
Schrottkatze 2022-10-02 17:39:04 +02:00
parent d7af51ee2c
commit 2615b67f63
4 changed files with 50 additions and 53 deletions

View file

@ -12,7 +12,7 @@ with builtins;
nixpkgs.config.allowUnfree = true;
nix = {
package = pkgs.nixFlakes;
package = pkgs.nixVersions.stable;
extraOptions = ''
experimental-features = nix-command flakes
keep-outputs = true
@ -26,9 +26,17 @@ with builtins;
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
networking.networkmanager.wifi.backend = "iwd";
networking.extraHosts = ''
127.0.0.1 tiktok.com
127.0.0.1 www.youtube.com
127.0.0.1 www.reddit.com
127.0.0.1 www.tiktok.com
127.0.0.1 www.twitter.com
127.0.0.1 www.instagram.com
127.0.0.1 www.facebook.com
127.0.0.1 www.snapchat.com
127.0.0.1 youtube.com
127.0.0.1 reddit.com
127.0.0.1 tiktok.com
127.0.0.1 twitter.com
127.0.0.1 instagram.com
127.0.0.1 facebook.com
@ -123,19 +131,17 @@ with builtins;
# missing: picom-jonaburg
environment.systemPackages = with pkgs; [
wget git neofetch pciutils pavucontrol font-manager zip unzip gnutar
iw btop xdotool xorg.xwininfo nodejs gparted networkmanagerapplet
mailspring betterdiscordctl pulseaudioFull speedtest-cli
librewolf polymc jdk8 jdk11 jdk vlc xfce.thunar xfce.tumbler
xfce.thunar-archive-plugin gnome.file-roller uhk-agent spotify spotify-tray
spotify-tui cool-retro-term lutris libsecret gh xorg.xhost helvum
xdg-desktop-portal-gtk nheko obsidian jetbrains.clion
jetbrains.webstorm jetbrains.datagrip jetbrains.idea-ultimate
jetbrains.pycharm-professional nix-prefetch-scripts audacity rustup
easyeffects virt-manager evince direnv nix-direnv python3Full
fzf openrgb krita gmic-qt-krita gimp-with-plugins inkscape-with-extensions blender virglrenderer ddccontrol-db
glab firebird-emu
obs-studio kdenlive
# spotify-tui jetbrains.webstorm jetbrains.datagrip jetbrains.idea-ultimate jetbrains.pycharm-professional python3Full jetbrains.clion
wget git neofetch pciutils pavucontrol font-manager zip unzip gnutar iw
btop xdotool xorg.xwininfo nodejs gparted networkmanagerapplet mailspring
betterdiscordctl pulseaudioFull speedtest-cli librewolf polymc jdk8 jdk11
jdk vlc xfce.thunar xfce.tumbler xfce.thunar-archive-plugin
gnome.file-roller uhk-agent spotify spotify-tray cool-retro-term lutris
libsecret gh xorg.xhost helvum xdg-desktop-portal-gtk nheko obsidian
nix-prefetch-scripts audacity rustup easyeffects virt-manager evince direnv
nix-direnv fzf openrgb krita gmic-qt-krita gimp-with-plugins
inkscape-with-extensions blender virglrenderer ddccontrol-db glab
firebird-emu obs-studio kdenlive openal
];
environment.pathsToLink = [

View file

@ -2,15 +2,17 @@
"nodes": {
"home-manager": {
"inputs": {
"nixpkgs": "nixpkgs",
"nixpkgs": [
"nixpkgs"
],
"utils": "utils"
},
"locked": {
"lastModified": 1661824092,
"narHash": "sha256-nSWLWytlXbeLrx5A+r5Pso7CvVrX5EgmIIXW/EXvPHQ=",
"lastModified": 1664573442,
"narHash": "sha256-AovlSIuJfMf8n9QLNUVtsCul+NVHIoen7APH2fLls3k=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "5bd66dc6cd967033489c69d486402b75d338eeb6",
"rev": "a7f0cc2d7b271b4a5df9b9e351d556c172f7e903",
"type": "github"
},
"original": {
@ -21,11 +23,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1662014623,
"narHash": "sha256-gyvnXDZZ/7W0UvBwtQgkUABUIJvC4IJY2AX/6SRqMQY=",
"lastModified": 1664465979,
"narHash": "sha256-+4AiXo0E3QiUo5cGZgoB5zhliIT1Dy8qjQwwmdmlguU=",
"owner": "kekrby",
"repo": "nixos-hardware",
"rev": "b0817d57d7fbc5dbfe34353ad67ebe70db3a1999",
"rev": "598d75b8c8014a81dd2c25cf8a681cfa11a25788",
"type": "github"
},
"original": {
@ -36,32 +38,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1654953433,
"narHash": "sha256-TwEeh4r50NdWHFAHQSyjCk2cZxgwUfcCCAJOhPdXB28=",
"owner": "nixos",
"lastModified": 1664676151,
"narHash": "sha256-Z1SgO3HP2yGVkOne67Tv7BtGDC7oXw2cbDwVP8KjyT0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "90cd5459a1fd707819b9a3fb9c852beaaac3b79a",
"rev": "8e0f159ff2d17faabbce0d60b14f50710e882eab",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1661595788,
"narHash": "sha256-m87mpIxqALkxpXMQdowHPquUF1SiqCufjnKZK9tFZcs=",
"owner": "kekrby",
"repo": "nixpkgs",
"rev": "a5fe34678f40ef37ca295da014db7d9aaea43a36",
"type": "github"
},
"original": {
"owner": "kekrby",
"ref": "add-fetchpartial",
"owner": "NixOS",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
@ -70,16 +56,16 @@
"inputs": {
"home-manager": "home-manager",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2"
"nixpkgs": "nixpkgs"
}
},
"utils": {
"locked": {
"lastModified": 1653893745,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {

View file

@ -2,15 +2,19 @@
description = "home manager config apparently";
inputs = {
nixpkgs.url = "github:kekrby/nixpkgs/add-fetchpartial";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpks.follows = "nixpkgs";
inputs.nixpkgs.follows = "nixpkgs";
};
nixos-hardware.url = "github:kekrby/nixos-hardware";
mac-brcm-fw = {
url = "path:./mac-brcm-fw";
flake = false;
};
};
outputs = { self, nixpkgs, home-manager, nixos-hardware,... }: {
outputs = { self, nixpkgs, home-manager, nixos-hardware, mac-brcm-fw, ... }: {
nixosConfigurations = {
monosodium-glutamate-g = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
@ -29,6 +33,7 @@
potatobook-g = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./mac-brcm-fw
./potatobook-g/configuration.nix
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;

View file

@ -10,11 +10,11 @@ in with lib; {
programs.kitty = {
enable = true;
font = {
name = "FiraCode Nerd Font Mono";
name = "FiraCode Nerd Font";
size = 11;
};
settings = {
adjust_column_width = "70%";
#adjust_column_width = "70%";
color0 = "#282828";
color8 = "#928374";