Compare commits

..

2 commits

18 changed files with 101 additions and 35 deletions

24
flake.lock generated
View file

@ -23,11 +23,11 @@
},
"nix-flatpak": {
"locked": {
"lastModified": 1732304879,
"narHash": "sha256-/DOW8VadE//HA6tuV2++NowYWi7Wa/FmJHXRJoTQnfQ=",
"lastModified": 1733345341,
"narHash": "sha256-8S58zrdpzGhax6tmn1i+R3AA0N9DJMu5FQI8JkA0NNU=",
"owner": "gmodena",
"repo": "nix-flatpak",
"rev": "c84579946c03c996916be0fb6e1340f444c277af",
"rev": "ebb0be49fc381112ff37726c6dd6df4df2ef5a1b",
"type": "github"
},
"original": {
@ -38,11 +38,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1732483221,
"narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
"lastModified": 1733217105,
"narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
"rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9",
"type": "github"
},
"original": {
@ -54,11 +54,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1732350895,
"narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=",
"lastModified": 1733261153,
"narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3",
"rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88",
"type": "github"
},
"original": {
@ -70,11 +70,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1732521221,
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
"lastModified": 1733212471,
"narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
"rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
"type": "github"
},
"original": {

View file

@ -7,14 +7,14 @@
# Main nix package repository
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
# NixOS unstable channel
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
home-manager = {
url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs";
};
# NixOS unstable channel
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
# ready made hardware configurations. e.G.: Power saving
nixos-hardware = {
url = "github:NixOS/nixos-hardware/master";

View file

@ -1,6 +1,7 @@
{
pkgs,
inputs,
modulesPath,
...
}: {
networking.hostName = "crocoite"; # Define your hostname.
@ -53,6 +54,9 @@
};
imports = [
# steam and other stuff seems to depend on perl
#"${modulesPath}/profiles/perlless.nix"
inputs.nix-flatpak.nixosModules.nix-flatpak
#nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen1
@ -74,6 +78,5 @@
../../modules/wm_and_de
../../modules/pkg_mgrmnt
];
}

View file

@ -1,4 +1,4 @@
{ ... }: {
{...}: {
imports = [
./boot_theming.nix
./environment.nix

View file

@ -1,4 +1,4 @@
{ ... }: {
{...}: {
imports = [
./flatpak.nix
./podman.nix

View file

@ -1,4 +1,4 @@
{ ... }: {
{...}: {
services.flatpak = {
enable = true;
update.auto = {
@ -18,6 +18,5 @@
location = "https://flathub.org/beta-repo/flathub-beta.flatpakrepo";
}
];
};
}

View file

@ -1,4 +1,4 @@
{ ... }: {
{...}: {
imports = [
./apparmor.nix
./firejail.nix

View file

@ -1,4 +1,4 @@
{ ... }: {
{...}: {
imports = [
./brave.nix
./firefox.nix

View file

@ -1,4 +1,4 @@
{ ... }: {
{...}: {
imports = [
./audio_video.nix
./flatpak.nix

View file

@ -1,4 +1,4 @@
{ ... }: {
{...}: {
services.flatpak = {
packages = [
{

View file

@ -1,4 +1,4 @@
{ ... }: {
{...}: {
imports = [
#./doc.nix
./index.nix

View file

@ -1,11 +1,20 @@
{pkgs, ...}: {
# disable default command not found feature
programs.command-not-found.enable = false;
environment.systemPackages = with pkgs; [
nix-index
];
programs.command-not-found.enable = false;
programs.nix-index = {
enable = true;
enableZshIntegration = true;
enableBashIntegration = true;
enableFishIntegration = true;
};
# for home-manager, use programs.bash.initExtra instead
programs.bash.interactiveShellInit = ''
source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
'';
#programs.bash.interactiveShellInit = ''
# source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
#'';
}

View file

@ -1,4 +1,57 @@
{pkgs, ...}: {
programs.zsh.enable = true;
# everyone should use zsh xD
users.defaultUserShell = pkgs.zsh;
# Prevent the new user dialog in zsh
system.userActivationScripts.zshrc = "touch .zshrc";
programs.zsh = {
enable = true;
shellInit = ''
compinit () {
builtin autoload -XUz /run/current-system/sw/share/zsh/$ZSH_VERSION/functions
}
# config options to make zsh obey XDG base directory standard
ZDOTDIR=$HOME/.config/zsh
[ -d "$HOME"/.config/zsh ] || mkdir -p "$HOME"/.config/zsh
HISTFILE="$XDG_STATE_HOME"/zsh/history
# Completion files: Use XDG dirs
[ -d "$XDG_CACHE_HOME"/zsh ] || mkdir -p "$XDG_CACHE_HOME"/zsh
zstyle ':completion:*' cache-path "$XDG_CACHE_HOME"/zsh/zcompcache
compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-$ZSH_VERSION
# Note that to manually override this in ~/.zshrc you should run `prompt off`
# before setting your PS1 and etc. Otherwise this will likely to interact with
# your ~/.zshrc configuration in unexpected ways as the default prompt sets
# a lot of different prompt variables.
autoload -U promptinit && promptinit && prompt suse && setopt prompt_sp
HISTFILE=~/.histfile
HISTSIZE=1000
SAVEHIST=1000
# bindkey
bindkey -e
bindkey "\e[3~" delete-char
# Home- und End-Keys.
bindkey '\e[1~' beginning-of-line
bindkey '\e[4~' end-of-line
# to redo the initial zsh installation run these commands
#autoload -Uz zsh-newuser-install
#zsh-newuser-install -f
'';
ohMyZsh.enable = true;
};
programs.starship = {
enable = true;
settings = {
add_newline = false;
};
presets = [
"jetpack"
];
};
}

View file

@ -50,6 +50,7 @@
qemu
home-manager
dfc
p7zip
# move to homemanager?
unstable.mumble
@ -63,7 +64,7 @@
keepassxc
#minecraft
element-desktop
rustdesk
rustdesk-flutter
timer
];

View file

@ -1,4 +1,4 @@
{ ... }: {
{...}: {
imports = [
./bluetooth.nix
./fwupd.nix

View file

@ -1,4 +1,4 @@
{ ... }: {
{...}: {
imports = [
./ranomier.nix
];

View file

@ -1,4 +1,4 @@
{ ... }: {
{...}: {
imports = [
./hyprland.nix
];

View file

@ -58,7 +58,8 @@
pamixer
waybar
hyprpaper
unstable.kanshi
#unstable.kanshi
shikane
dunst
# audio