diff --git a/.gitignore b/.gitignore index bc227f8..92b2793 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ .direnv -flake.lock diff --git a/base.nix b/base.nix index ee1b6db..8bebbcf 100644 --- a/base.nix +++ b/base.nix @@ -68,6 +68,7 @@ ]; }; }; + documentation = { enable = false; }; users.groups.piracy.gid = 985; environment = { systemPackages = with pkgs; [ wget ]; @@ -122,10 +123,7 @@ }; }; programs = { - nh = { - enable = true; - clean.enable = true; - }; + nh.enable = true; starship.enable = true; tmux.enable = true; fzf.fuzzyCompletion = true; diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..ee416bb --- /dev/null +++ b/flake.lock @@ -0,0 +1,83 @@ +{ + "nodes": { + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1716736833, + "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.05", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-master": { + "locked": { + "lastModified": 1717264137, + "narHash": "sha256-A60ioNR5Y51tgKMVpzs/9QtmJ0r2hz/3ZUPsjVYVPRc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b5769881ca41f3ddb5b164ff034f4b068970c75a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1716948383, + "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "nixpkgs": "nixpkgs", + "nixpkgs-master": "nixpkgs-master", + "nixpkgs-unstable": "nixpkgs-unstable" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/modules/apps/multimedia.nix b/modules/apps/multimedia.nix index 6c1e9ee..b6c306c 100644 --- a/modules/apps/multimedia.nix +++ b/modules/apps/multimedia.nix @@ -2,6 +2,7 @@ options.my.apps.multimedia.enable = lib.mkEnableOption "enable"; config = lib.mkIf config.my.apps.multimedia.enable { users.users.jawz.packages = with pkgs; [ + scrcpy # android screen share fooyin # foobar inspired music player pitivi # video editor celluloid # video player diff --git a/modules/dev/nix.nix b/modules/dev/nix.nix index ed8384e..b54ef3f 100644 --- a/modules/dev/nix.nix +++ b/modules/dev/nix.nix @@ -4,7 +4,8 @@ users.users.jawz.packages = with pkgs; ([ expect # keep color when nom'ing nix-output-monitor # autistic nix builds - nixfmt # linting + nixfmt-classic # linting + nixfmt-rfc-style # linting cachix # why spend time compiling? nixd # language server ]); diff --git a/overlays/blanket.nix b/overlays/blanket.nix deleted file mode 100644 index c4b38f8..0000000 --- a/overlays/blanket.nix +++ /dev/null @@ -1,11 +0,0 @@ -final: prev: { - blanket = prev.blanket.overrideAttrs (old: rec { - version = "0.7.0"; - src = prev.fetchFromGitHub { - owner = "rafaelmardojai"; - repo = "blanket"; - rev = "refs/tags/${version}"; - sha256 = "sha256-mY7c5i0me7mMbD8c6eGJeaZpR8XI5QVL4n3M+j15Z1c="; - }; - }); -} diff --git a/overlays/gnome.nix b/overlays/gnome.nix deleted file mode 100644 index 99d99f8..0000000 --- a/overlays/gnome.nix +++ /dev/null @@ -1,14 +0,0 @@ -final: prev: - -{ - gnome = prev.gnome.overrideScope' (gnomeFinal: gnomePrev: { - mutter = gnomePrev.mutter.overrideAttrs (old: { - src = prev.pkgs.fetchgit { - url = "https://gitlab.gnome.org/vanvugt/mutter.git"; - # GNOME 45: triple-buffering-v4-45 - rev = "0b896518b2028d9c4d6ea44806d093fd33793689"; - sha256 = "sha256-mzNy5GPlB2qkI2KEAErJQzO//uo8yO0kPQUwvGDwR4w="; - }; - }); - }); -}