diff options
| -rw-r--r-- | flake.lock | 82 | ||||
| -rw-r--r-- | flake.nix | 8 | ||||
| -rw-r--r-- | hosts/navi/default.nix | 2 | ||||
| -rw-r--r-- | mixins/cli.nix | 20 | ||||
| -rw-r--r-- | mixins/multimedia.nix | 94 |
5 files changed, 94 insertions, 112 deletions
diff --git a/flake.lock b/flake.lock index c5d0ac8..225714d 100644 --- a/flake.lock +++ b/flake.lock @@ -49,11 +49,11 @@ ] }, "locked": { - "lastModified": 1690548222, - "narHash": "sha256-EcVjLOpbAuL/y55fLlEl3BNM4FP5Pwtp+6DbTiL6FDM=", + "lastModified": 1690739034, + "narHash": "sha256-roW02IaiQ3gnEEDMCDWL5YyN+C4nBf/te6vfL7rG0jk=", "owner": "nix-community", "repo": "disko", - "rev": "43f17a8b31c49f6696b8b258d317161afdc7e36b", + "rev": "4015740375676402a2ee6adebc3c30ea625b9a94", "type": "github" }, "original": { @@ -105,11 +105,11 @@ ] }, "locked": { - "lastModified": 1690652600, - "narHash": "sha256-Dy09g7mezToVwtFPyY25fAx1hzqNXv73/QmY5/qyR44=", + "lastModified": 1690846843, + "narHash": "sha256-sfguzocpi42+juoiUNLMtXws33DeEZkbEVTLtx/LKC8=", "owner": "nix-community", "repo": "home-manager", - "rev": "f58889c07efa8e1328fdf93dc1796ec2a5c47f38", + "rev": "310c0063b2558e94ad8bc3c1f2ddead82e0872cd", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "impermanence": { "locked": { - "lastModified": 1684264534, - "narHash": "sha256-K0zr+ry3FwIo3rN2U/VWAkCJSgBslBisvfRIPwMbuCQ=", + "lastModified": 1690797372, + "narHash": "sha256-GImz19e33SeVcIvBB7NnhbJSbTpFFmNtWLh7Z85Y188=", "owner": "nix-community", "repo": "impermanence", - "rev": "89253fb1518063556edd5e54509c30ac3089d5e6", + "rev": "e3a7acd113903269a1b5c8b527e84ce7ee859851", "type": "github" }, "original": { @@ -133,6 +133,26 @@ "type": "github" } }, + "nix-index-database": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1690687539, + "narHash": "sha256-Lnwz9XKtshm+5OeWqCbj/3tKuKK+DL5tUTdKSRrKBlY=", + "owner": "Mic92", + "repo": "nix-index-database", + "rev": "d74b8171153ae35d7d323a9b1ad6c4cf7a995591", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "nix-index-database", + "type": "github" + } + }, "nixinate": { "inputs": { "nixpkgs": [ @@ -171,11 +191,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1690548937, - "narHash": "sha256-x3ZOPGLvtC0/+iFAg9Kvqm/8hTAIkGjc634SqtgaXTA=", + "lastModified": 1690789960, + "narHash": "sha256-3K+2HuyGTiJUSZNJxXXvc0qj4xFx1FHC/ItYtEa7/Xs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2a9d660ff0f7ffde9d73be328ee6e6f10ef66b28", + "rev": "fb942492b7accdee4e6d17f5447091c65897dde4", "type": "github" }, "original": { @@ -185,27 +205,6 @@ "type": "github" } }, - "programsdb": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1690708944, - "narHash": "sha256-GQ2KQMEl0Dstia6eNu8FMqzoQn5n4gimuAGK8Q5tbbw=", - "owner": "wamserma", - "repo": "flake-programs-sqlite", - "rev": "23c8f9a189a26fd041a9e45e35aa706852b07432", - "type": "github" - }, - "original": { - "owner": "wamserma", - "repo": "flake-programs-sqlite", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -213,27 +212,12 @@ "hardware": "hardware", "home-manager": "home-manager_2", "impermanence": "impermanence", + "nix-index-database": "nix-index-database", "nixinate": "nixinate", "nixpkgs": "nixpkgs_2", - "programsdb": "programsdb", "viper-nix-common": "viper-nix-common" } }, - "utils": { - "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "viper-nix-common": { "inputs": { "nixpkgs-lib": [ diff --git a/flake.nix b/flake.nix index c5f559c..ac60c1a 100644 --- a/flake.nix +++ b/flake.nix @@ -14,10 +14,6 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - programsdb = { - url = "github:wamserma/flake-programs-sqlite"; - inputs.nixpkgs.follows = "nixpkgs"; - }; viper-nix-common = { url = "github:viperML/nix-common"; inputs.nixpkgs-lib.follows = "nixpkgs"; @@ -26,6 +22,10 @@ url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-index-database = { + url = "github:Mic92/nix-index-database"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs @ {self, ...}: { diff --git a/hosts/navi/default.nix b/hosts/navi/default.nix index e689bc3..c1496e0 100644 --- a/hosts/navi/default.nix +++ b/hosts/navi/default.nix @@ -89,7 +89,7 @@ ]; home-manager.users.tzlil = { - home.packages = [pkgs.schildichat-desktop-wayland pkgs.keepassxc]; + home.packages = [pkgs.schildichat-desktop-wayland pkgs.keepassxc pkgs.gtkcord4]; programs.qutebrowser = { enable = true; settings.colors.webpage.darkmode.enabled = true; diff --git a/mixins/cli.nix b/mixins/cli.nix index 936098d..6c784eb 100644 --- a/mixins/cli.nix +++ b/mixins/cli.nix @@ -7,15 +7,10 @@ }: { config = { home-manager.users.tzlil = { - pkgs, - config, - nixosConfig, - ... - }: { imports = [ inputs.viper-nix-common.homeModules.xdg + inputs.nix-index-database.hmModules.nix-index ]; - programs.command-not-found.dbPath = inputs.programsdb.packages.${pkgs.system}.programs-sqlite; home = { packages = with pkgs; [ rsync @@ -52,9 +47,6 @@ '' ) ]; - #sessionVariables = { - #EDITOR = "nvim"; - #}; }; programs = { git = { @@ -86,7 +78,7 @@ end nix shell $p ''; - fish_command_not_found = "nix shell nixpkgs#(command-not-found $argv[1] &| sed -nr 's/.*-p (.*)$/\\1/p' | ${lib.getExe pkgs.fzf} || return 0) -c $argv[1]"; + # fish_command_not_found = "nix shell nixpkgs#(command-not-found $argv[1] &| sed -nr 's/.*-p (.*)$/\\1/p' | ${lib.getExe pkgs.fzf} || return 0) -c $argv[1]"; }; }; neovim = { @@ -98,6 +90,14 @@ set clipboard+=unnamedplus ''; }; + + # nix-locate + command-not-found.enable = lib.mkForce false; + nix-index = { + enable = true; + enableFishIntegration = true; + }; + # gpg = { # enable = true; # mutableKeys = false; diff --git a/mixins/multimedia.nix b/mixins/multimedia.nix index 9b82a4f..dbd258c 100644 --- a/mixins/multimedia.nix +++ b/mixins/multimedia.nix @@ -5,59 +5,57 @@ inputs, ... }: { - config = { - home-manager.users.tzlil = {config, ...}: { - fonts.fontconfig.enable = true; - home.packages = with pkgs; [ - ffmpeg - gimp - transmission - xdg-utils - xdg-user-dirs - ]; - xdg = { + home-manager.users.tzlil = { + fonts.fontconfig.enable = true; + home.packages = with pkgs; [ + ffmpeg + gimp + transmission + xdg-utils + xdg-user-dirs + ]; + xdg = { + enable = true; + mime.enable = true; + mimeApps = { enable = true; - mime.enable = true; - mimeApps = { - enable = true; - defaultApplications = { - "application/pdf" = ["${pkgs.zathura}/share/applications/org.pwmt.zathura.desktop"]; - "image/png" = ["${pkgs.swayimg}/share/applications/swayimg.desktop"]; - "image/jpeg" = ["${pkgs.swayimg}/share/applications/swayimg.desktop"]; - }; + defaultApplications = { + "application/pdf" = ["${pkgs.zathura}/share/applications/org.pwmt.zathura.desktop"]; + "image/png" = ["${pkgs.swayimg}/share/applications/swayimg.desktop"]; + "image/jpeg" = ["${pkgs.swayimg}/share/applications/swayimg.desktop"]; }; - userDirs = { - createDirectories = true; - desktop = "${config.home.homeDirectory}/desktop"; - download = "${config.home.homeDirectory}/downloads"; - }; - #portal = { - # enable = true; - # extraPortals = with pkgs; [ - # xdg-desktop-portal-wlr - # xdg-desktop-portal-gtk - # ]; - #}; }; + userDirs = { + createDirectories = true; + desktop = "${config.home.homeDirectory}/desktop"; + download = "${config.home.homeDirectory}/downloads"; + }; + #portal = { + # enable = true; + # extraPortals = with pkgs; [ + # xdg-desktop-portal-wlr + # xdg-desktop-portal-gtk + # ]; + #}; + }; - programs = { - mpv = { - enable = true; - scripts = with pkgs.mpvScripts; [ - mpris - #youtube-quality - (pkgs.callPackage ./youtube-quality.nix {}) - ]; - config = { - sub-auto = "fuzzy"; - ytdl-raw-options = "write-auto-sub=,sub-lang=en"; - }; + programs = { + mpv = { + enable = true; + scripts = with pkgs.mpvScripts; [ + mpris + #youtube-quality + (pkgs.callPackage ./youtube-quality.nix {}) + ]; + config = { + sub-auto = "fuzzy"; + ytdl-raw-options = "write-auto-sub=,sub-lang=en"; }; - zathura = { - enable = true; - options = { - selection-clipboard = "clipboard"; - }; + }; + zathura = { + enable = true; + options = { + selection-clipboard = "clipboard"; }; }; }; |