diff --git a/flake.lock b/flake.lock index cd0aea8..5dadc0b 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1733345341, - "narHash": "sha256-8S58zrdpzGhax6tmn1i+R3AA0N9DJMu5FQI8JkA0NNU=", + "lastModified": 1732304879, + "narHash": "sha256-/DOW8VadE//HA6tuV2++NowYWi7Wa/FmJHXRJoTQnfQ=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "ebb0be49fc381112ff37726c6dd6df4df2ef5a1b", + "rev": "c84579946c03c996916be0fb6e1340f444c277af", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733217105, - "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", + "lastModified": 1732483221, + "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", + "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", "type": "github" }, "original": { @@ -54,11 +54,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733261153, - "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=", + "lastModified": 1732350895, + "narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88", + "rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 287f0c1..0c0e544 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 bfbafbd..c8dfb57 100644 --- a/hosts/crocoite/crocoite.nix +++ b/hosts/crocoite/crocoite.nix @@ -1,7 +1,6 @@ { pkgs, inputs, - modulesPath, ... }: { networking.hostName = "crocoite"; # Define your hostname. @@ -54,9 +53,6 @@ }; 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 @@ -78,5 +74,6 @@ ../../modules/wm_and_de ../../modules/pkg_mgrmnt + ]; } diff --git a/modules/default.nix b/modules/default.nix index 9a104ec..8d6c975 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 85f07d2..71c5425 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 e960c2b..09cdc72 100644 --- a/modules/pkg_mgrmnt/flatpak.nix +++ b/modules/pkg_mgrmnt/flatpak.nix @@ -1,4 +1,4 @@ -{...}: { +{ ... }: { services.flatpak = { enable = true; update.auto = { @@ -18,5 +18,6 @@ location = "https://flathub.org/beta-repo/flathub-beta.flatpakrepo"; } ]; + }; } diff --git a/modules/sec_auth/default.nix b/modules/sec_auth/default.nix index cadf739..8b8f5eb 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 41597c1..c7993a3 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 d6f8fb9..8a9ebdf 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 5480176..39f6aa2 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 22e6296..98db3a7 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/nix-helper/index.nix b/modules/software/nix-helper/index.nix index 9eabaa3..2733242 100644 --- a/modules/software/nix-helper/index.nix +++ b/modules/software/nix-helper/index.nix @@ -1,20 +1,11 @@ {pkgs, ...}: { - # disable default command not found feature - programs.command-not-found.enable = false; - environment.systemPackages = with pkgs; [ nix-index ]; - programs.nix-index = { - enable = true; - enableZshIntegration = true; - enableBashIntegration = true; - enableFishIntegration = true; - }; - + programs.command-not-found.enable = false; # 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/shell.nix b/modules/software/shell.nix index 835fbe0..ad14ac4 100644 --- a/modules/software/shell.nix +++ b/modules/software/shell.nix @@ -1,57 +1,4 @@ {pkgs, ...}: { - # everyone should use zsh xD + programs.zsh.enable = true; 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 441ab74..5e35767 100644 --- a/modules/software/software.nix +++ b/modules/software/software.nix @@ -50,7 +50,6 @@ qemu home-manager dfc - p7zip # move to homemanager? unstable.mumble @@ -64,7 +63,7 @@ keepassxc #minecraft element-desktop - rustdesk-flutter + rustdesk timer ]; diff --git a/modules/specific_hardware/default.nix b/modules/specific_hardware/default.nix index d64c479..1eb44d0 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 ade0a0f..e76314b 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 b02afc2..74809a6 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 06d4f07..e5ba3b1 100644 --- a/modules/wm_and_de/hyprland.nix +++ b/modules/wm_and_de/hyprland.nix @@ -58,8 +58,7 @@ pamixer waybar hyprpaper - #unstable.kanshi - shikane + unstable.kanshi dunst # audio