diff --git a/flake.lock b/flake.lock index cd40b97..58ae5e2 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,62 @@ { "nodes": { + "dhist": { + "inputs": { + "fenix": "fenix", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1659395338, + "narHash": "sha256-gIWFyqnkX7gnfOxUaJjZ+fMjlMtE6GfZsfxop8sDYpk=", + "owner": "lelgenio", + "repo": "dhist", + "rev": "11b2d9671adb775f373d4b3ec5f27fdf7ea957c6", + "type": "github" + }, + "original": { + "owner": "lelgenio", + "repo": "dhist", + "type": "github" + } + }, + "fenix": { + "inputs": { + "nixpkgs": [ + "dhist", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1659336065, + "narHash": "sha256-vjHzA2MRrw6seWzBGUA2dciObvf1Be4lA3SsAI5aufA=", + "owner": "nix-community", + "repo": "fenix", + "rev": "75a63f0868d8362aaa0ae2f9d5e77a65780fdd58", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1656928814, + "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -23,16 +80,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1657815135, - "narHash": "sha256-+5Jby1ayRjtSgsM5IpRNeUgdcIutCKQWR6sypRtd1RE=", + "lastModified": 1659219666, + "narHash": "sha256-pzYr5fokQPHv7CmUXioOhhzDy/XyWOIXP4LZvv/T7Mk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c06d5fa9c605d143b15cafdbbb61c7c95388d76e", + "rev": "7b9be38c7250b22d829ab6effdee90d5e40c6e5c", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-22.05", + "ref": "nixos-unstable", "type": "indirect" } }, @@ -51,6 +108,21 @@ "type": "indirect" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1657815135, + "narHash": "sha256-+5Jby1ayRjtSgsM5IpRNeUgdcIutCKQWR6sypRtd1RE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c06d5fa9c605d143b15cafdbbb61c7c95388d76e", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-22.05", + "type": "indirect" + } + }, "nur": { "locked": { "lastModified": 1657945102, @@ -68,13 +140,31 @@ }, "root": { "inputs": { + "dhist": "dhist", "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur" } + }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1659290320, + "narHash": "sha256-OUezy1BkIoqpkTE5wOtsjJ/Gy48Ql8EL1/t6MZzRkWw=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "2b472f6684bb1958274995d12b2c50310d88cc52", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } } }, "root": "root", "version": 7 -} \ No newline at end of file +} diff --git a/flake.nix b/flake.nix index ef843d5..b30ade9 100644 --- a/flake.nix +++ b/flake.nix @@ -6,8 +6,11 @@ home-manager.url = "github:nix-community/home-manager/release-22.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nur.url = "github:nix-community/NUR"; + + # my stuff + dhist.url = "github:lelgenio/dhist"; }; - outputs = { nixpkgs, nixpkgs-unstable, home-manager, nur, ... }: + outputs = { nixpkgs, nixpkgs-unstable, home-manager, nur, dhist, ... }: let system = "x86_64-linux"; pkgs = import nixpkgs { @@ -27,7 +30,12 @@ ./system/configuration.nix # nur.nixosModules.nur ({ config, pkgs, ... }: { - nixpkgs.overlays = [ overlay-unstable nur.overlay ]; + nixpkgs.overlays = [ + overlay-unstable nur.overlay + (_: _: { + dhist = dhist.packages.${system}.dhist; + }) + ]; }) home-manager.nixosModules.home-manager { diff --git a/system/configuration.nix b/system/configuration.nix index 9038277..91c7ca3 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -35,7 +35,7 @@ let in '' export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS gnome_schema=org.gnome.desktop.interface - gsettings set $gnome_schema gtk-theme 'Dracula' + # gsettings set $gnome_schema gtk-theme 'Dracula' ''; }; in { @@ -156,10 +156,12 @@ in { alacritty # gpu accelerated terminal sway dbus-sway-environment + pkgs.xdg-desktop-portal + pkgs.xdg-desktop-portal-wlr configure-gtk wayland glib # gsettings - dracula-theme # gtk theme + # dracula-theme # gtk theme gnome3.adwaita-icon-theme # default gnome cursors swaylock swayidle diff --git a/user/home.nix b/user/home.nix index 3a55e6b..ec7659a 100644 --- a/user/home.nix +++ b/user/home.nix @@ -100,6 +100,7 @@ in { kanshi xfce.thunar pass + dhist # media yt-dlp ffmpeg