From edc26b9646db46aca63be797374aec450779c0e5 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Wed, 4 Dec 2024 04:35:39 +0100 Subject: [PATCH 1/2] 272 current 2024-12-04 04:35:32 24.11.20241123.0c58267 6.12.1 * --- flake.nix | 6 +-- hosts/crocoite/crocoite.nix | 5 ++- modules/default.nix | 2 +- modules/pkg_mgrmnt/default.nix | 2 +- modules/pkg_mgrmnt/flatpak.nix | 3 +- modules/sec_auth/default.nix | 2 +- modules/software/browser/default.nix | 2 +- modules/software/default.nix | 2 +- modules/software/flatpak.nix | 2 +- modules/software/nix-helper/default.nix | 2 +- modules/software/shell.nix | 55 ++++++++++++++++++++++++- modules/software/software.nix | 2 +- modules/specific_hardware/default.nix | 2 +- modules/users/default.nix | 2 +- modules/wm_and_de/default.nix | 2 +- modules/wm_and_de/hyprland.nix | 3 +- 16 files changed, 75 insertions(+), 19 deletions(-) diff --git a/flake.nix b/flake.nix index 0c0e544..287f0c1 100644 --- a/flake.nix +++ b/flake.nix @@ -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"; diff --git a/hosts/crocoite/crocoite.nix b/hosts/crocoite/crocoite.nix index c8dfb57..bfbafbd 100644 --- a/hosts/crocoite/crocoite.nix +++ b/hosts/crocoite/crocoite.nix @@ -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 - ]; } diff --git a/modules/default.nix b/modules/default.nix index 8d6c975..9a104ec 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,4 +1,4 @@ -{ ... }: { +{...}: { imports = [ ./boot_theming.nix ./environment.nix diff --git a/modules/pkg_mgrmnt/default.nix b/modules/pkg_mgrmnt/default.nix index 71c5425..85f07d2 100644 --- a/modules/pkg_mgrmnt/default.nix +++ b/modules/pkg_mgrmnt/default.nix @@ -1,4 +1,4 @@ -{ ... }: { +{...}: { imports = [ ./flatpak.nix ./podman.nix diff --git a/modules/pkg_mgrmnt/flatpak.nix b/modules/pkg_mgrmnt/flatpak.nix index 09cdc72..e960c2b 100644 --- a/modules/pkg_mgrmnt/flatpak.nix +++ b/modules/pkg_mgrmnt/flatpak.nix @@ -1,4 +1,4 @@ -{ ... }: { +{...}: { services.flatpak = { enable = true; update.auto = { @@ -18,6 +18,5 @@ location = "https://flathub.org/beta-repo/flathub-beta.flatpakrepo"; } ]; - }; } diff --git a/modules/sec_auth/default.nix b/modules/sec_auth/default.nix index 8b8f5eb..cadf739 100644 --- a/modules/sec_auth/default.nix +++ b/modules/sec_auth/default.nix @@ -1,4 +1,4 @@ -{ ... }: { +{...}: { imports = [ ./apparmor.nix ./firejail.nix diff --git a/modules/software/browser/default.nix b/modules/software/browser/default.nix index c7993a3..41597c1 100644 --- a/modules/software/browser/default.nix +++ b/modules/software/browser/default.nix @@ -1,4 +1,4 @@ -{ ... }: { +{...}: { imports = [ ./brave.nix ./firefox.nix diff --git a/modules/software/default.nix b/modules/software/default.nix index 8a9ebdf..d6f8fb9 100644 --- a/modules/software/default.nix +++ b/modules/software/default.nix @@ -1,4 +1,4 @@ -{ ... }: { +{...}: { imports = [ ./audio_video.nix ./flatpak.nix diff --git a/modules/software/flatpak.nix b/modules/software/flatpak.nix index 39f6aa2..5480176 100644 --- a/modules/software/flatpak.nix +++ b/modules/software/flatpak.nix @@ -1,4 +1,4 @@ -{ ... }: { +{...}: { services.flatpak = { packages = [ { diff --git a/modules/software/nix-helper/default.nix b/modules/software/nix-helper/default.nix index 98db3a7..22e6296 100644 --- a/modules/software/nix-helper/default.nix +++ b/modules/software/nix-helper/default.nix @@ -1,4 +1,4 @@ -{ ... }: { +{...}: { imports = [ #./doc.nix ./index.nix diff --git a/modules/software/shell.nix b/modules/software/shell.nix index ad14ac4..835fbe0 100644 --- a/modules/software/shell.nix +++ b/modules/software/shell.nix @@ -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" + ]; + }; } diff --git a/modules/software/software.nix b/modules/software/software.nix index 5e35767..167fe97 100644 --- a/modules/software/software.nix +++ b/modules/software/software.nix @@ -63,7 +63,7 @@ keepassxc #minecraft element-desktop - rustdesk + rustdesk-flutter timer ]; diff --git a/modules/specific_hardware/default.nix b/modules/specific_hardware/default.nix index 1eb44d0..d64c479 100644 --- a/modules/specific_hardware/default.nix +++ b/modules/specific_hardware/default.nix @@ -1,4 +1,4 @@ -{ ... }: { +{...}: { imports = [ ./bluetooth.nix ./fwupd.nix diff --git a/modules/users/default.nix b/modules/users/default.nix index e76314b..ade0a0f 100644 --- a/modules/users/default.nix +++ b/modules/users/default.nix @@ -1,4 +1,4 @@ -{ ... }: { +{...}: { imports = [ ./ranomier.nix ]; diff --git a/modules/wm_and_de/default.nix b/modules/wm_and_de/default.nix index 74809a6..b02afc2 100644 --- a/modules/wm_and_de/default.nix +++ b/modules/wm_and_de/default.nix @@ -1,4 +1,4 @@ -{ ... }: { +{...}: { imports = [ ./hyprland.nix ]; diff --git a/modules/wm_and_de/hyprland.nix b/modules/wm_and_de/hyprland.nix index e5ba3b1..06d4f07 100644 --- a/modules/wm_and_de/hyprland.nix +++ b/modules/wm_and_de/hyprland.nix @@ -58,7 +58,8 @@ pamixer waybar hyprpaper - unstable.kanshi + #unstable.kanshi + shikane dunst # audio From 5f1728a0db0dff89736d9a034c44a86d1fbca3f7 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Thu, 5 Dec 2024 03:59:20 +0100 Subject: [PATCH 2/2] 275 current 2024-12-05 03:59:12 24.11.20241203.b681065 6.12.1 * --- flake.lock | 24 ++++++++++++------------ modules/software/nix-helper/index.nix | 17 +++++++++++++---- modules/software/software.nix | 1 + 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 5dadc0b..cd0aea8 100644 --- a/flake.lock +++ b/flake.lock @@ -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": { diff --git a/modules/software/nix-helper/index.nix b/modules/software/nix-helper/index.nix index 2733242..9eabaa3 100644 --- a/modules/software/nix-helper/index.nix +++ b/modules/software/nix-helper/index.nix @@ -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 + #''; } diff --git a/modules/software/software.nix b/modules/software/software.nix index 167fe97..441ab74 100644 --- a/modules/software/software.nix +++ b/modules/software/software.nix @@ -50,6 +50,7 @@ qemu home-manager dfc + p7zip # move to homemanager? unstable.mumble