push changes

This commit is contained in:
Jo 2023-11-19 23:12:39 +01:00
parent 5b7d0b0a49
commit 05b36550a3
6 changed files with 284 additions and 73 deletions

View file

@ -1,5 +1,103 @@
{ {
"nodes": { "nodes": {
"catppuccinifier": {
"inputs": {
"crane": "crane",
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1696928114,
"narHash": "sha256-h445Aox0jck7MOCsKxXLKiE4QvptL/54eXUuhQZGF7o=",
"owner": "lighttigerXIV",
"repo": "catppuccinifier",
"rev": "ef9c180bb7bbf1486671a1c6df41adaab60a9b41",
"type": "github"
},
"original": {
"owner": "lighttigerXIV",
"repo": "catppuccinifier",
"type": "github"
}
},
"crane": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"nixpkgs": [
"catppuccinifier",
"nixpkgs"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1687310026,
"narHash": "sha256-20RHFbrnC+hsG4Hyeg/58LvQAK7JWfFItTPFAFamu8E=",
"owner": "ipetkov",
"repo": "crane",
"rev": "116b32c30b5ff28e49f4fcbeeb1bbe3544593204",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1687171271,
"narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -39,9 +137,67 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"catppuccinifier": "catppuccinifier",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
},
"rust-overlay": {
"inputs": {
"flake-utils": [
"catppuccinifier",
"crane",
"flake-utils"
],
"nixpkgs": [
"catppuccinifier",
"crane",
"nixpkgs"
]
},
"locked": {
"lastModified": 1685759304,
"narHash": "sha256-I3YBH6MS3G5kGzNuc1G0f9uYfTcNY9NYoRc3QsykLk4=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "c535b4f3327910c96dcf21851bbdd074d0760290",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -12,6 +12,12 @@
home-manager.url = "github:nix-community/home-manager/master"; home-manager.url = "github:nix-community/home-manager/master";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
# Catppuccinifier
catppuccinifier = {
url = "github:lighttigerXIV/catppuccinifier";
inputs.nixpkgs.follows = "nixpkgs";
};
# TODO: Add any other flake you might need # TODO: Add any other flake you might need
# hardware.url = "github:nixos/nixos-hardware"; # hardware.url = "github:nixos/nixos-hardware";
@ -24,6 +30,7 @@
self, self,
nixpkgs, nixpkgs,
home-manager, home-manager,
catppuccinifier,
... ...
} @ inputs: let } @ inputs: let
inherit (self) outputs; inherit (self) outputs;
@ -33,7 +40,7 @@
nixosConfigurations = { nixosConfigurations = {
# FIXME replace with your hostname # FIXME replace with your hostname
nixos = nixpkgs.lib.nixosSystem { nixos = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs;}; specialArgs = {inherit inputs outputs catppuccinifier;};
# > Our main nixos configuration file < # > Our main nixos configuration file <
modules = [ modules = [
./nixos/configuration.nix ./nixos/configuration.nix

View file

@ -38,76 +38,76 @@
homeDirectory = "/home/jo"; homeDirectory = "/home/jo";
}; };
home.packages = with pkgs.gnomeExtensions; [ # home.packages = with pkgs.gnomeExtensions; [
user-themes # user-themes
dash-to-dock # dash-to-dock
appindicator # appindicator
blur-my-shell # blur-my-shell
rounded-window-corners # rounded-window-corners
]; # ];
dconf.settings = with lib.hm.gvariant; { # dconf.settings = with lib.hm.gvariant; {
"org/gnome/shell" = { # "org/gnome/shell" = {
disable-user-extensions = false; # disable-user-extensions = false;
# enabled-extensions = map (extension: extension.extensionUuid) home.packages; # # enabled-extensions = map (extension: extension.extensionUuid) home.packages;
disabled-extensions = [ ]; # disabled-extensions = [ ];
}; # };
"org/gnome/shell/extensions/user-theme" = { # "org/gnome/shell/extensions/user-theme" = {
name = config.gtk.theme.name; # name = config.gtk.theme.name;
}; # };
# "org/gnome/shell/extensions/dash-to-dock" = { # # "org/gnome/shell/extensions/dash-to-dock" = {
# "appicon-margin" = 0; # # "appicon-margin" = 0;
# "appicon-padding" = 6; # # "appicon-padding" = 6;
# "tray-padding" = 4; # # "tray-padding" = 4;
# "click-action" = "TOGGLE-SHOWPREVIEW"; # # "click-action" = "TOGGLE-SHOWPREVIEW";
# "dot-position" = "TOP"; # # "dot-position" = "TOP";
# "dot-style-focused" = "METRO"; # # "dot-style-focused" = "METRO";
# "dot-style-unfocused" = "DASHES"; # # "dot-style-unfocused" = "DASHES";
# "group-apps" = true; # # "group-apps" = true;
# "isolate-workspaces" = true; # # "isolate-workspaces" = true;
# "middle-click-action" = "MINIMIZE"; # # "middle-click-action" = "MINIMIZE";
# "shift-click-action" = "LAUNCH"; # # "shift-click-action" = "LAUNCH";
# "scroll-icon-action" = "NOTHING"; # # "scroll-icon-action" = "NOTHING";
# "scroll-panel-action" = "NOTHING"; # # "scroll-panel-action" = "NOTHING";
# "stockgs-panelbtn-click-only" = true; # # "stockgs-panelbtn-click-only" = true;
# }; # # };
"org/gnome/desktop/interface" = { # "org/gnome/desktop/interface" = {
color-scheme = "prefer-dark"; # color-scheme = "prefer-dark";
clock-show-weekday = true; # clock-show-weekday = true;
clock-show-date = true; # clock-show-date = true;
clock-show-seconds = false; # clock-show-seconds = false;
enable-hot-corners = false; # enable-hot-corners = false;
}; # };
"org/gnome/desktop/input-sources" = { # "org/gnome/desktop/input-sources" = {
sources = [ (mkTuple [ "xkb" "de" ]) ]; # sources = [ (mkTuple [ "xkb" "de" ]) ];
}; # };
"org/gnome/shell" = { # "org/gnome/shell" = {
favorite-apps = [ # favorite-apps = [
"firefox.desktop" # "firefox.desktop"
"org.gnome.Nautilus.desktop" # "org.gnome.Nautilus.desktop"
]; # ];
}; # };
}; # };
gtk = { # gtk = {
enable = true; # enable = true;
theme = { # theme = {
name = "Adw-gtk3"; # name = "Adw-gtk3";
package = pkgs.adw-gtk3; # package = pkgs.adw-gtk3;
}; # };
cursorTheme = { # cursorTheme = {
name = "Catppuccin-Macchiato-Dark-Cursors"; # name = "Catppuccin-Macchiato-Dark-Cursors";
package = pkgs.catppuccin-cursors.macchiatoRed; # package = pkgs.catppuccin-cursors.macchiatoRed;
size = 32; # size = 32;
}; # };
}; # };
# home.file.".config/gtk-4.0/gtk.css".source = "${orchis}/share/themes/Orchis-Green-Dark-Compact/gtk-4.0/gtk.css"; # home.file.".config/gtk-4.0/gtk.css".source = "${orchis}/share/themes/Orchis-Green-Dark-Compact/gtk-4.0/gtk.css";
# home.file.".config/gtk-4.0/gtk-dark.css".source = "${orchis}/share/themes/Orchis-Green-Dark-Compact/gtk-4.0/gtk-dark.css"; # home.file.".config/gtk-4.0/gtk-dark.css".source = "${orchis}/share/themes/Orchis-Green-Dark-Compact/gtk-4.0/gtk-dark.css";

View file

View file

@ -3,6 +3,7 @@
lib, lib,
config, config,
pkgs, pkgs,
catppuccinifier,
... ...
}: { }: {
# You can import other NixOS modules here # You can import other NixOS modules here
@ -37,11 +38,6 @@
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
settings = { settings = {
substituters = [
"https://cache.nixos.org?priority=10"
"https://nix-community.cachix.org"
];
auto-optimise-store = true; auto-optimise-store = true;
builders-use-substitutes = true; builders-use-substitutes = true;
experimental-features = [ "nix-command" "flakes" "repl-flake" ]; experimental-features = [ "nix-command" "flakes" "repl-flake" ];
@ -58,6 +54,8 @@
}; };
}; };
boot.kernelPackages = pkgs.linuxPackages_latest;
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
@ -102,19 +100,49 @@
pulse.enable = true; pulse.enable = true;
}; };
# Enable bluetooth on boot
hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true;
networking.wg-quick = {
interfaces.homelab = {
privateKey = "kJ+2MOoYbtI6K00pJbVQshD7bXx/pjKw01wlMih9FFI=";
address = [ "10.8.0.2/24" ];
dns = [ "1.1.1.1" ];
peers = [
# For a client configuration, one peer entry for the server will suffice.
{
# Public key of the server (not a file path).
publicKey = "MTUi5FzlUQX1Vl2PLC72hnZnREn5kYRGqS6QSnaFeyQ=";
presharedKey = "Spzeg7KwMXuczdkpMygmzix5QBkgTOrR3lLlO7862yw=";
allowedIPs = [ "0.0.0.0/0" "::/0" ];
endpoint = "jo-server.duckdns.org:51820";
persistentKeepalive = 0;
}
];
};
};
# Enable docker
virtualisation.docker.enable = true;
# Enable touchpad support (enabled default in most desktopManager). # Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true; services.xserver.libinput.enable = true;
# Define a user account. Don't forget to set a password with passwd. # Define a user account. Don't forget to set a password with passwd.
users.users = { users.users = {
jo = { jo = {
isNormalUser = true; isNormalUser = true;
description = "Jo"; description = "Jo";
extraGroups = [ "networkmanager" "wheel" ]; extraGroups = [ "networkmanager" "wheel" "docker" ];
packages = with pkgs; [ packages = with pkgs; [
discord discord
# ciscoPacketTracer8 ciscoPacketTracer8
wireshark wireshark
joplin-desktop
teamspeak_client
virtualbox
]; ];
}; };
@ -132,16 +160,29 @@
}; };
}; };
programs.steam = {
enable = true;
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
};
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
nano nano
git
vscodium
firefox firefox
thunderbird thunderbird
vlc
libreoffice
wineWowPackages.waylandFull
xorg.xf86inputlibinput
gimp
ungoogled-chromium
gnome.gnome-tweaks # For development
vscodium
git
nodejs_20
]; ];
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion

View file

@ -17,4 +17,11 @@
layout = "de"; layout = "de";
xkbVariant = ""; xkbVariant = "";
}; };
environment.systemPackages = with pkgs; [
lightly-boehs
kde-rounded-corners
];
programs.kdeconnect.enable = true;
} }